Skip to content

Commit 5616ef6

Browse files
nathanielerowenathanielerowe
authored
Merge pull request #876 from SBNSoftware/feature/acastill_realistic_pmt_mc
Feature/acastill realistic pmt mc
2 parents c0fe9e1 + dc4ef3e commit 5616ef6

29 files changed

+893
-210
lines changed

‎sbndcode/JobConfigurations/standard/reco/config/workflow_reco1.fcl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ sbnd_reco1_producers:{
1818
rns: { module_type: RandomNumberSaver }
1919

2020
### optical deconvolution
21-
opdecopmt: @local::SBNDOpDeconvolutionPMT
22-
opdecoxarapuca: @local::SBNDOpDeconvolutionXARAPUCA
21+
opdecopmt: @local::SBNDOpDeconvolutionPMT_realisticMC
22+
opdecoxarapuca: @local::SBNDOpDeconvolutionXARAPUCA
2323

2424
### optical hit finders
2525
# ophit: @local::sbnd_hit_finder
26-
ophitpmt: @local::SBNDDecoOpHitFinderPMT
27-
ophitxarapuca: @local::SBNDDecoOpHitFinderXArapuca
26+
ophitpmt: @local::SBNDDecoOpHitFinderPMT_realisticMC
27+
ophitxarapuca: @local::SBNDDecoOpHitFinderXArapuca
2828

2929
### flash finders
3030
# opflash: @local::sbnd_opflash
31-
opflashtpc0: @local::SBNDDecoSimpleFlashTPC0
32-
opflashtpc1: @local::SBNDDecoSimpleFlashTPC1
31+
opflashtpc0: @local::SBNDDecoSimpleFlashTPC0_realisticMC
32+
opflashtpc1: @local::SBNDDecoSimpleFlashTPC1_realisticMC
3333

3434
## opflash(arapucas): @local::sbnd_opflash
3535
opflashtpc0xarapuca: @local::SBNDDecoSimpleFlashTPC0Arapuca

‎sbndcode/JobConfigurations/standard/reco/reco1_data.fcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "drops_reco1.fcl"
22
#include "wcsp_data_sbnd.fcl"
3-
#include "opdeconvolution_sbnd_data.fcl"
4-
#include "sbnd_ophitfinder_deco_data.fcl"
5-
#include "sbnd_flashfinder_deco_data.fcl"
3+
#include "opdeconvolution_sbnd.fcl"
4+
#include "sbnd_ophitfinder_deco.fcl"
5+
#include "sbnd_flashfinder_deco.fcl"
66
#include "wfalign_sbnd_data.fcl"
77
#include "standard_reco1_sbnd.fcl"
88

‎sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "wcsimsp_sbnd.fcl"
3535
#include "crtsimmodules_sbnd.fcl"
3636
#include "opdetdigitizer_sbnd.fcl"
37+
#include "sbnd_pmtpulseoscillation_config.fcl"
3738
#include "rootoutput_sbnd.fcl"
3839
#include "pmtmcmetricproducer.fcl"
3940

@@ -63,15 +64,16 @@ physics:
6364

6465
producers:
6566
{
66-
rns: { module_type: "RandomNumberSaver" }
67-
simtpc2d: @local::sbnd_wcls_simsp_bothrois
68-
crtsim: @local::sbnd_crtsim
69-
opdaq: @local::sbnd_opdetdigitizer
67+
rns: { module_type: "RandomNumberSaver" }
68+
simtpc2d: @local::sbnd_wcls_simsp_bothrois
69+
crtsim: @local::sbnd_crtsim
70+
opdaq: @local::sbnd_opdetdigitizer
7071
pmtmetricmc: @local::sbnd_pmtmcmetricproducer
72+
pmtpulseoscillation: @local::sbnd_pmtpulseoscillation
7173
}
7274

7375
#define the producer and filter modules for this path, order matters,
74-
simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc]
76+
simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc, pmtpulseoscillation]
7577

7678
#define the output stream, there could be more than one if using filters
7779
stream1: [ out1 ]

‎sbndcode/OpDetReco/OpDeconvolution/job/opdeconvolution_sbnd.fcl‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "opdeconvolution_alg.fcl"
2+
#include "opdeconvolution_alg_data.fcl"
23

34
BEGIN_PROLOG
45

@@ -11,6 +12,8 @@ SBNDOpDeconvolution:
1112
OpDecoAlg: @local::OpDeconvolutionAlg
1213
}
1314

15+
###### PMT IDEAL MC ######
16+
1417
SBNDOpDeconvolutionPMT: @local::SBNDOpDeconvolution
1518
SBNDOpDeconvolutionPMT.PDTypes: ["pmt_coated", "pmt_uncoated"]
1619
SBNDOpDeconvolutionPMT.Electronics: [""]
@@ -20,6 +23,34 @@ SBNDOpDeconvolutionPMT.OpDecoAlg.FilterParams: [0.049, 2] #Freq in GHz
2023
SBNDOpDeconvolutionPMT.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
2124
SBNDOpDeconvolutionPMT.OpDecoAlg.DecoWaveformPrecision: 0.005
2225

26+
27+
###### PMT DATA ######
28+
29+
SBNDOpDeconvolutionPMT_data: @local::SBNDOpDeconvolution
30+
SBNDOpDeconvolutionPMT_data.OpDecoAlg: @local::OpDeconvolutionAlgData
31+
SBNDOpDeconvolutionPMT_data.InputLabel: "wfalign:PMTChannels"
32+
SBNDOpDeconvolutionPMT_data.PDTypes: ["pmt_coated", "pmt_uncoated"]
33+
SBNDOpDeconvolutionPMT_data.Electronics: [""]
34+
SBNDOpDeconvolutionPMT_data.OpDecoAlg.OpDetDataFile: "./OpDetSim/digi_pmt_sbnd_data_OV6.root"
35+
SBNDOpDeconvolutionPMT_data.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
36+
SBNDOpDeconvolutionPMT_data.OpDecoAlg.DecoWaveformPrecision: 0.005
37+
SBNDOpDeconvolutionPMT_data.OpDecoAlg.SkipChannelList: [39, 66, 67, 71, 85, 86, 87, 92, 115, 138, 141, 170, 197, 217, 218, 221, 222, 223, 226, 245, 248, 249, 302]
38+
39+
###### PMT REALISTIC MC ######
40+
41+
SBNDOpDeconvolutionPMT_realisticMC: @local::SBNDOpDeconvolution
42+
SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg: @local::OpDeconvolutionAlgData
43+
SBNDOpDeconvolutionPMT_realisticMC.InputLabel: "pmtpulseoscillation"
44+
SBNDOpDeconvolutionPMT_realisticMC.PDTypes: ["pmt_coated", "pmt_uncoated"]
45+
SBNDOpDeconvolutionPMT_realisticMC.Electronics: [""]
46+
SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.OpDetDataFile: "./OpDetSim/digi_pmt_sbnd_data_OV6.root"
47+
SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
48+
SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.DecoWaveformPrecision: 0.005
49+
SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.SkipChannelList: [39, 66, 67, 71, 85, 86, 87, 92, 115, 138, 141, 170, 197, 217, 218, 221, 222, 223, 226, 245, 248, 249, 302]
50+
51+
52+
###### XA IDEAL MC ######
53+
2354
SBNDOpDeconvolutionXARAPUCA: @local::SBNDOpDeconvolution
2455
SBNDOpDeconvolutionXARAPUCA.PDTypes: ["xarapuca_vuv", "xarapuca_vis"]
2556
SBNDOpDeconvolutionXARAPUCA.Electronics: ["daphne"]

‎sbndcode/OpDetReco/OpDeconvolution/job/opdeconvolution_sbnd_data.fcl‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎sbndcode/OpDetReco/OpDeconvolution/job/run_decohitfinder_data.fcl‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
#include "messages_sbnd.fcl"
44
#include "sam_sbnd.fcl"
55

6-
#include "opdeconvolution_sbnd_data.fcl"
7-
#include "sbnd_flashfinder_deco_data.fcl"
8-
#include "sbnd_ophitfinder_deco_data.fcl"
6+
#include "opdeconvolution_sbnd.fcl"
7+
#include "sbnd_flashfinder_deco.fcl"
8+
#include "sbnd_ophitfinder_deco.fcl"
99
#include "wfalign_sbnd_data.fcl"
10-
1110
process_name: DecoRecoData
1211

1312
services:
@@ -57,7 +56,6 @@ physics:
5756
opflashtpc1
5857
]
5958

60-
6159
stream1: [out1]
6260
trigger_paths: [reco]
6361

‎sbndcode/OpDetReco/OpDeconvolution/job/sbnd_flashfinder_deco.fcl‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
BEGIN_PROLOG
44

5+
56
####OpFlash finder for PMT deconvolved waveforms#####
7+
8+
9+
###### PMT IDEAL MC ######
610
###TPC0
711
SBNDDecoSimpleFlashTPC0: @local::SBNDSimpleFlashTPC0
812
SBNDDecoSimpleFlashTPC0.PECalib.SPEAreaGain: 200
@@ -22,8 +26,57 @@ SBNDDecoSimpleFlashTPC1.ReadoutDelay: 0.135 //cable time delay in us
2226
SBNDDecoSimpleFlashTPC1.CorrectLightPropagation: true
2327

2428

29+
###### PMT DATA ######
30+
###TPC0
31+
SBNDDecoSimpleFlashTPC0_data: @local::SBNDSimpleFlashTPC0
32+
SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
33+
SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.DataCalibration: true
34+
SBNDDecoSimpleFlashTPC0_data.PECalib.SPEAreaGain: 200
35+
SBNDDecoSimpleFlashTPC0_data.OpHitProducers: ["ophitpmt"]
36+
SBNDDecoSimpleFlashTPC0_data.OpHitInputTime: "RiseTime"
37+
SBNDDecoSimpleFlashTPC0_data.UseT0Tool: true
38+
SBNDDecoSimpleFlashTPC0_data.ReadoutDelay: 0 //cable time delay in us
39+
SBNDDecoSimpleFlashTPC0_data.CorrectLightPropagation: true
40+
SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_data_v2.root"
41+
42+
#TPC1
43+
SBNDDecoSimpleFlashTPC1_data: @local::SBNDSimpleFlashTPC1
44+
SBNDDecoSimpleFlashTPC1_data.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
45+
SBNDDecoSimpleFlashTPC1_data.DriftEstimatorConfig.DataCalibration: true
46+
SBNDDecoSimpleFlashTPC1_data.PECalib.SPEAreaGain: 200
47+
SBNDDecoSimpleFlashTPC1_data.OpHitProducers: ["ophitpmt"]
48+
SBNDDecoSimpleFlashTPC1_data.OpHitInputTime: "RiseTime"
49+
SBNDDecoSimpleFlashTPC1_data.UseT0Tool: true
50+
SBNDDecoSimpleFlashTPC1_data.ReadoutDelay: 0 //cable time delay in us
51+
SBNDDecoSimpleFlashTPC1_data.CorrectLightPropagation: true
52+
53+
54+
###### PMT REALISTIC MC ######
55+
###TPC0
56+
SBNDDecoSimpleFlashTPC0_realisticMC: @local::SBNDSimpleFlashTPC0
57+
SBNDDecoSimpleFlashTPC0_realisticMC.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
58+
SBNDDecoSimpleFlashTPC0_realisticMC.DriftEstimatorConfig.DataCalibration: true
59+
SBNDDecoSimpleFlashTPC0_realisticMC.PECalib.SPEAreaGain: 200
60+
SBNDDecoSimpleFlashTPC0_realisticMC.OpHitProducers: ["ophitpmt"]
61+
SBNDDecoSimpleFlashTPC0_realisticMC.OpHitInputTime: "RiseTime"
62+
SBNDDecoSimpleFlashTPC0_realisticMC.UseT0Tool: true
63+
SBNDDecoSimpleFlashTPC0_realisticMC.ReadoutDelay: 0 //cable time delay in us
64+
SBNDDecoSimpleFlashTPC0_realisticMC.CorrectLightPropagation: true
65+
66+
#TPC1
67+
SBNDDecoSimpleFlashTPC1_realisticMC: @local::SBNDSimpleFlashTPC1
68+
SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
69+
SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.DataCalibration: true
70+
SBNDDecoSimpleFlashTPC1_realisticMC.PECalib.SPEAreaGain: 200
71+
SBNDDecoSimpleFlashTPC1_realisticMC.OpHitProducers: ["ophitpmt"]
72+
SBNDDecoSimpleFlashTPC1_realisticMC.OpHitInputTime: "RiseTime"
73+
SBNDDecoSimpleFlashTPC1_realisticMC.UseT0Tool: true
74+
SBNDDecoSimpleFlashTPC1_realisticMC.ReadoutDelay: 0 //cable time delay in us
75+
SBNDDecoSimpleFlashTPC1_realisticMC.CorrectLightPropagation: true
76+
SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_data_v2.root"
2577

2678

79+
###### XA IDEAL MC ######
2780

2881
####OpFlash finder for XArapucas deconvolved waveforms#####
2982
###TPC0

‎sbndcode/OpDetReco/OpDeconvolution/job/sbnd_flashfinder_deco_data.fcl‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎sbndcode/OpDetReco/OpDeconvolution/job/sbnd_ophitfinder_deco.fcl‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
BEGIN_PROLOG
44

5+
###### MC CONFIGURATION ######
6+
7+
58
#####OpHit finder for PMT deconvolved waveforms#####
69
SBNDDecoOpHitFinderPMT: @local::sbnd_ophit_finder_pmt
710
####SPE area must be 1./DecoWaveformPrecision
@@ -63,4 +66,44 @@ SBNDDecoOpHitFinderXArapuca.PedAlgoPset.NumSampleTail: 50
6366
SBNDDecoOpHitFinderXArapuca.PedAlgoPset.Method:2
6467

6568

69+
###### DATA CONFIGURATION ######
70+
71+
#####OpHit finder for PMT deconvolved waveforms#####
72+
SBNDDecoOpHitFinderPMT_data: @local::sbnd_ophit_finder_pmt
73+
####SPE area must be 1./DecoWaveformPrecision
74+
SBNDDecoOpHitFinderPMT_data.SPEArea: 200
75+
SBNDDecoOpHitFinderPMT_data.InputModule: "opdecopmt"
76+
SBNDDecoOpHitFinderPMT_data.HitThreshold: 1
77+
SBNDDecoOpHitFinderPMT_data.RiseTimeCalculator: @local::sbnd_opreco_risetimecalculator
78+
79+
#HitAlgoPset
80+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.ADCThreshold: 25
81+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.ADCThresholdByChannel: true
82+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.ADCThresholdVector: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 18.0, 35.0, 19.0, 21.0, 19.0, 20.0, 21.0, 27.0, 19.0, 27.0, 21.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 22.0, 19.0, 37.0, 50.0, 20.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 24.0, 19.0, 26.0, 19.0, 12.0, 30.0, 50.0, 25.0, 14.0, 12.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 50.0, 50.0, 50.0, 19.0, 19.0, 24.0, 21.0, 28.0, 19.0, 22.0, 18.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 22.0, 50.0, 19.0, 22.0, 35.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 30.0, 50.0, 20.0, 25.0, 23.0, 32.0, 20.0, 22.0, 20.0, 18.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 23.0, 50.0, 19.0, 25.0, 19.0, 18.0, 19.0, 15.0, 21.0, 24.0, 21.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 20.0, 30.0, 26.0, 18.0, 34.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 27.0, 50.0, 50.0, 21.0, 28.0, 50.0, 50.0, 50.0, 19.0, 19.0, 50.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 19.0, 30.0, 20.0, 18.0, 50.0, 18.0, 19.0, 13.0, 50.0, 25.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 19.0, 25.0, 22.0, 19.0, 29.0, 19.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 22.0, 23.0, 29.0, 19.0, 27.0, 20.0, 25.0, 22.0, 50.0, 19.0, 25.0, 21.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0]
83+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NSigmaThreshold: 3.4
84+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.EndADCThreshold: 8
85+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.EndNSigmaThreshold: 0.2
86+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.MinPulseWidth: 4
87+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.Name: "SlidingWindow"
88+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NumPostSample: 6
89+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NumPreSample: 3
90+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.PositivePolarity: true
91+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.TailADCThreshold: 2
92+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.TailNSigmaThreshold: 2
93+
SBNDDecoOpHitFinderPMT_data.HitAlgoPset.Verbosity: false
94+
95+
#BaselinePset
96+
SBNDDecoOpHitFinderPMT_data.PedAlgoPset.Name:"Edges"
97+
SBNDDecoOpHitFinderPMT_data.PedAlgoPset.NumSampleFront:200
98+
SBNDDecoOpHitFinderPMT_data.PedAlgoPset.NumSampleTail:200
99+
SBNDDecoOpHitFinderPMT_data.PedAlgoPset.Method:2
100+
101+
102+
###### REALISTICMC CONFIGURATION ######
103+
104+
#####OpHit finder for PMT deconvolved waveforms#####
105+
SBNDDecoOpHitFinderPMT_realisticMC: @local::SBNDDecoOpHitFinderPMT_data
106+
####SPE area must be 1./DecoWaveformPrecision
107+
SBNDDecoOpHitFinderPMT_realisticMC.InputModule: "pmtpulseoscillation"
108+
66109
END_PROLOG

‎sbndcode/OpDetReco/OpDeconvolution/job/sbnd_ophitfinder_deco_data.fcl‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)