Feature/acastill realistic pmt mc

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

@@ -18,18 +18,18 @@ sbnd_reco1_producers:{
     rns:                 { module_type: RandomNumberSaver }
 
     ### optical deconvolution
-    opdecopmt:          @local::SBNDOpDeconvolutionPMT
-	 opdecoxarapuca:     @local::SBNDOpDeconvolutionXARAPUCA
+    opdecopmt:          @local::SBNDOpDeconvolutionPMT_realisticMC
+	opdecoxarapuca:     @local::SBNDOpDeconvolutionXARAPUCA
 
     ### optical hit finders
     # ophit:               @local::sbnd_hit_finder
-    ophitpmt:            @local::SBNDDecoOpHitFinderPMT
-	 ophitxarapuca:   @local::SBNDDecoOpHitFinderXArapuca
+    ophitpmt:            @local::SBNDDecoOpHitFinderPMT_realisticMC
+	ophitxarapuca:   @local::SBNDDecoOpHitFinderXArapuca
 
     ### flash finders
     # opflash:             @local::sbnd_opflash
-    opflashtpc0:         @local::SBNDDecoSimpleFlashTPC0
-    opflashtpc1:         @local::SBNDDecoSimpleFlashTPC1
+    opflashtpc0:         @local::SBNDDecoSimpleFlashTPC0_realisticMC
+    opflashtpc1:         @local::SBNDDecoSimpleFlashTPC1_realisticMC
 
     ## opflash(arapucas):             @local::sbnd_opflash
     opflashtpc0xarapuca:         @local::SBNDDecoSimpleFlashTPC0Arapuca

sbndcode/JobConfigurations/standard/reco/reco1_data.fcl

@@ -1,8 +1,8 @@
 #include "drops_reco1.fcl"
 #include "wcsp_data_sbnd.fcl"
-#include "opdeconvolution_sbnd_data.fcl"
-#include "sbnd_ophitfinder_deco_data.fcl"
-#include "sbnd_flashfinder_deco_data.fcl"
+#include "opdeconvolution_sbnd.fcl"
+#include "sbnd_ophitfinder_deco.fcl"
+#include "sbnd_flashfinder_deco.fcl"
 #include "wfalign_sbnd_data.fcl"
 #include "standard_reco1_sbnd.fcl"
 

sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl

@@ -34,6 +34,7 @@
 #include "wcsimsp_sbnd.fcl"
 #include "crtsimmodules_sbnd.fcl"
 #include "opdetdigitizer_sbnd.fcl"
+#include "sbnd_pmtpulseoscillation_config.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "pmtmcmetricproducer.fcl"
 
@@ -63,15 +64,16 @@ physics:
 
   producers:
   {
-    rns:         { module_type: "RandomNumberSaver" }
-    simtpc2d:    @local::sbnd_wcls_simsp_bothrois
-    crtsim:      @local::sbnd_crtsim
-    opdaq:       @local::sbnd_opdetdigitizer
+    rns:       { module_type: "RandomNumberSaver" }
+    simtpc2d:  @local::sbnd_wcls_simsp_bothrois
+    crtsim:    @local::sbnd_crtsim
+    opdaq:     @local::sbnd_opdetdigitizer
     pmtmetricmc: @local::sbnd_pmtmcmetricproducer
+    pmtpulseoscillation: @local::sbnd_pmtpulseoscillation
   }
 
   #define the producer and filter modules for this path, order matters,
-  simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc]
+  simulate: [rns, simtpc2d, crtsim, opdaq, pmtmetricmc, pmtpulseoscillation]
 
   #define the output stream, there could be more than one if using filters
   stream1:   [ out1 ]

sbndcode/OpDetReco/OpDeconvolution/job/opdeconvolution_sbnd.fcl

@@ -1,4 +1,5 @@
 #include "opdeconvolution_alg.fcl"
+#include "opdeconvolution_alg_data.fcl"
 
 BEGIN_PROLOG
 
@@ -11,6 +12,8 @@ SBNDOpDeconvolution:
   OpDecoAlg: @local::OpDeconvolutionAlg
 }
 
+###### PMT IDEAL MC ######
+
 SBNDOpDeconvolutionPMT: @local::SBNDOpDeconvolution
 SBNDOpDeconvolutionPMT.PDTypes: ["pmt_coated", "pmt_uncoated"]
 SBNDOpDeconvolutionPMT.Electronics: [""]
@@ -20,6 +23,34 @@ SBNDOpDeconvolutionPMT.OpDecoAlg.FilterParams: [0.049, 2] #Freq in GHz
 SBNDOpDeconvolutionPMT.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
 SBNDOpDeconvolutionPMT.OpDecoAlg.DecoWaveformPrecision: 0.005
 
+
+###### PMT DATA ######
+
+SBNDOpDeconvolutionPMT_data: @local::SBNDOpDeconvolution
+SBNDOpDeconvolutionPMT_data.OpDecoAlg: @local::OpDeconvolutionAlgData
+SBNDOpDeconvolutionPMT_data.InputLabel: "wfalign:PMTChannels"
+SBNDOpDeconvolutionPMT_data.PDTypes: ["pmt_coated", "pmt_uncoated"]
+SBNDOpDeconvolutionPMT_data.Electronics: [""]
+SBNDOpDeconvolutionPMT_data.OpDecoAlg.OpDetDataFile: "./OpDetSim/digi_pmt_sbnd_data_OV6.root"
+SBNDOpDeconvolutionPMT_data.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
+SBNDOpDeconvolutionPMT_data.OpDecoAlg.DecoWaveformPrecision: 0.005
+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]
+
+###### PMT REALISTIC MC ######
+
+SBNDOpDeconvolutionPMT_realisticMC: @local::SBNDOpDeconvolution
+SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg: @local::OpDeconvolutionAlgData
+SBNDOpDeconvolutionPMT_realisticMC.InputLabel: "pmtpulseoscillation"
+SBNDOpDeconvolutionPMT_realisticMC.PDTypes: ["pmt_coated", "pmt_uncoated"]
+SBNDOpDeconvolutionPMT_realisticMC.Electronics: [""]
+SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.OpDetDataFile: "./OpDetSim/digi_pmt_sbnd_data_OV6.root"
+SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.Filter: "(x>0)*exp(-0.5*pow(x/[0],[1]))" #Gauss filter, remove DC component F(0)=0
+SBNDOpDeconvolutionPMT_realisticMC.OpDecoAlg.DecoWaveformPrecision: 0.005
+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]
+
+
+###### XA IDEAL MC ######
+
 SBNDOpDeconvolutionXARAPUCA: @local::SBNDOpDeconvolution
 SBNDOpDeconvolutionXARAPUCA.PDTypes: ["xarapuca_vuv", "xarapuca_vis"]
 SBNDOpDeconvolutionXARAPUCA.Electronics: ["daphne"]

sbndcode/OpDetReco/OpDeconvolution/job/run_decohitfinder_data.fcl

@@ -3,11 +3,10 @@
 #include "messages_sbnd.fcl"
 #include "sam_sbnd.fcl"
 
-#include "opdeconvolution_sbnd_data.fcl"
-#include "sbnd_flashfinder_deco_data.fcl"
-#include "sbnd_ophitfinder_deco_data.fcl"
+#include "opdeconvolution_sbnd.fcl"
+#include "sbnd_flashfinder_deco.fcl"
+#include "sbnd_ophitfinder_deco.fcl"
 #include "wfalign_sbnd_data.fcl"
-
 process_name: DecoRecoData
 
 services:
@@ -57,7 +56,6 @@ physics:
     opflashtpc1
   ]
 
-
   stream1: [out1]
   trigger_paths: [reco]
 

sbndcode/OpDetReco/OpDeconvolution/job/sbnd_flashfinder_deco.fcl

@@ -2,7 +2,11 @@
 
 BEGIN_PROLOG
 
+
 ####OpFlash finder for PMT deconvolved waveforms#####
+
+
+###### PMT IDEAL MC ######
 ###TPC0
 SBNDDecoSimpleFlashTPC0: @local::SBNDSimpleFlashTPC0
 SBNDDecoSimpleFlashTPC0.PECalib.SPEAreaGain: 200
@@ -22,8 +26,57 @@ SBNDDecoSimpleFlashTPC1.ReadoutDelay: 0.135 //cable time delay in us
 SBNDDecoSimpleFlashTPC1.CorrectLightPropagation: true
 
 
+###### PMT DATA ######
+###TPC0
+SBNDDecoSimpleFlashTPC0_data: @local::SBNDSimpleFlashTPC0
+SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
+SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.DataCalibration: true
+SBNDDecoSimpleFlashTPC0_data.PECalib.SPEAreaGain: 200
+SBNDDecoSimpleFlashTPC0_data.OpHitProducers: ["ophitpmt"]
+SBNDDecoSimpleFlashTPC0_data.OpHitInputTime: "RiseTime"
+SBNDDecoSimpleFlashTPC0_data.UseT0Tool: true
+SBNDDecoSimpleFlashTPC0_data.ReadoutDelay: 0 //cable time delay in us
+SBNDDecoSimpleFlashTPC0_data.CorrectLightPropagation: true
+SBNDDecoSimpleFlashTPC0_data.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_data_v2.root"
+
+#TPC1
+SBNDDecoSimpleFlashTPC1_data: @local::SBNDSimpleFlashTPC1
+SBNDDecoSimpleFlashTPC1_data.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
+SBNDDecoSimpleFlashTPC1_data.DriftEstimatorConfig.DataCalibration: true
+SBNDDecoSimpleFlashTPC1_data.PECalib.SPEAreaGain: 200
+SBNDDecoSimpleFlashTPC1_data.OpHitProducers: ["ophitpmt"]
+SBNDDecoSimpleFlashTPC1_data.OpHitInputTime: "RiseTime"
+SBNDDecoSimpleFlashTPC1_data.UseT0Tool: true
+SBNDDecoSimpleFlashTPC1_data.ReadoutDelay: 0 //cable time delay in us
+SBNDDecoSimpleFlashTPC1_data.CorrectLightPropagation: true
+
+
+###### PMT REALISTIC MC ######
+###TPC0
+SBNDDecoSimpleFlashTPC0_realisticMC: @local::SBNDSimpleFlashTPC0
+SBNDDecoSimpleFlashTPC0_realisticMC.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
+SBNDDecoSimpleFlashTPC0_realisticMC.DriftEstimatorConfig.DataCalibration: true
+SBNDDecoSimpleFlashTPC0_realisticMC.PECalib.SPEAreaGain: 200
+SBNDDecoSimpleFlashTPC0_realisticMC.OpHitProducers: ["ophitpmt"]
+SBNDDecoSimpleFlashTPC0_realisticMC.OpHitInputTime: "RiseTime"
+SBNDDecoSimpleFlashTPC0_realisticMC.UseT0Tool: true
+SBNDDecoSimpleFlashTPC0_realisticMC.ReadoutDelay: 0 //cable time delay in us
+SBNDDecoSimpleFlashTPC0_realisticMC.CorrectLightPropagation: true
+
+#TPC1
+SBNDDecoSimpleFlashTPC1_realisticMC: @local::SBNDSimpleFlashTPC1
+SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.tool_type: "DriftEstimatorPMTRatio"
+SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.DataCalibration: true
+SBNDDecoSimpleFlashTPC1_realisticMC.PECalib.SPEAreaGain: 200
+SBNDDecoSimpleFlashTPC1_realisticMC.OpHitProducers: ["ophitpmt"]
+SBNDDecoSimpleFlashTPC1_realisticMC.OpHitInputTime: "RiseTime"
+SBNDDecoSimpleFlashTPC1_realisticMC.UseT0Tool: true
+SBNDDecoSimpleFlashTPC1_realisticMC.ReadoutDelay: 0 //cable time delay in us
+SBNDDecoSimpleFlashTPC1_realisticMC.CorrectLightPropagation: true
+SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_data_v2.root"
 
 
+###### XA IDEAL MC ######
 
 ####OpFlash finder for XArapucas deconvolved waveforms#####
 ###TPC0

sbndcode/OpDetReco/OpDeconvolution/job/sbnd_ophitfinder_deco.fcl

@@ -2,6 +2,9 @@
 
 BEGIN_PROLOG
 
+###### MC CONFIGURATION ######
+
+
 #####OpHit finder for PMT deconvolved waveforms#####
 SBNDDecoOpHitFinderPMT: @local::sbnd_ophit_finder_pmt
 ####SPE area must be 1./DecoWaveformPrecision
@@ -63,4 +66,44 @@ SBNDDecoOpHitFinderXArapuca.PedAlgoPset.NumSampleTail: 50
 SBNDDecoOpHitFinderXArapuca.PedAlgoPset.Method:2
 
 
+###### DATA CONFIGURATION ######
+
+#####OpHit finder for PMT deconvolved waveforms#####
+SBNDDecoOpHitFinderPMT_data: @local::sbnd_ophit_finder_pmt
+####SPE area must be 1./DecoWaveformPrecision
+SBNDDecoOpHitFinderPMT_data.SPEArea: 200
+SBNDDecoOpHitFinderPMT_data.InputModule: "opdecopmt"
+SBNDDecoOpHitFinderPMT_data.HitThreshold: 1
+SBNDDecoOpHitFinderPMT_data.RiseTimeCalculator:   @local::sbnd_opreco_risetimecalculator
+
+#HitAlgoPset
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.ADCThreshold: 25
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.ADCThresholdByChannel: true
+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]
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NSigmaThreshold: 3.4
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.EndADCThreshold: 8
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.EndNSigmaThreshold: 0.2
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.MinPulseWidth: 4
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.Name: "SlidingWindow"
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NumPostSample: 6
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.NumPreSample: 3
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.PositivePolarity: true
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.TailADCThreshold: 2
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.TailNSigmaThreshold: 2
+SBNDDecoOpHitFinderPMT_data.HitAlgoPset.Verbosity: false 
+
+#BaselinePset
+SBNDDecoOpHitFinderPMT_data.PedAlgoPset.Name:"Edges"
+SBNDDecoOpHitFinderPMT_data.PedAlgoPset.NumSampleFront:200
+SBNDDecoOpHitFinderPMT_data.PedAlgoPset.NumSampleTail:200
+SBNDDecoOpHitFinderPMT_data.PedAlgoPset.Method:2
+
+
+###### REALISTICMC CONFIGURATION ######
+
+#####OpHit finder for PMT deconvolved waveforms#####
+SBNDDecoOpHitFinderPMT_realisticMC: @local::SBNDDecoOpHitFinderPMT_data
+####SPE area must be 1./DecoWaveformPrecision
+SBNDDecoOpHitFinderPMT_realisticMC.InputModule: "pmtpulseoscillation"
+
 END_PROLOG

sbndcode/OpDetSim/CMakeLists.txt

@@ -177,6 +177,7 @@ install_source()
 cet_enable_asserts()
 add_subdirectory(PMTAlg)
 add_subdirectory(HDWvf)
+add_subdirectory(PMTPulseOscillations)
 
 # install sbnd_pds_mapping.json with mapping of the photon detectors
 install_fw(LIST sbnd_pds_mapping.json)