Merge branch 'develop' into feature/TriggerWorkNikki-PR

Author: npallat

CMakeLists.txt

@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.14.00.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 

sbndcode/JobConfigurations/base/detsim_drops.fcl

@@ -25,7 +25,8 @@ detsim_drops: [ @sequence::g4_drops
                 , "drop sim::SimEnergyDeposits_ionandscintout__*"
                 , "drop sim::SimEnergyDeposits_ionandscint_*_*"
                 , "drop sim::SimEnergyDeposits_largeant_*_*"
-				, "keep sim::SimEnergyDeposits_ionandscint_priorSCE_*"]
+				, "keep sim::SimEnergyDeposits_ionandscint_priorSCE_*"
+                , "drop raw::OpDetWaveforms_opdaq_*_*"]
 
 END_PROLOG
 

sbndcode/OpDetReco/OpDeconvolution/job/run_decohitfinder.fcl

@@ -41,28 +41,27 @@ physics:
 {
   producers:
   {
-    opdecopmt:     @local::SBNDOpDeconvolutionPMT
-    ophitpmt:  @local::SBNDDecoOpHitFinderPMT
-    opflashtpc0:   @local::SBNDDecoSimpleFlashTPC0
-    opflashtpc1:   @local::SBNDDecoSimpleFlashTPC1
+    opdecopmt:     @local::SBNDOpDeconvolutionPMT_realisticMC
+    ophitpmt:  @local::SBNDDecoOpHitFinderPMT_realisticMC
+    opflashtpc0:   @local::SBNDDecoSimpleFlashTPC0_realisticMC
+    opflashtpc1:   @local::SBNDDecoSimpleFlashTPC1_realisticMC
 
     opdecoxarapuca:     @local::SBNDOpDeconvolutionXARAPUCA
     ophitxarapuca:  @local::SBNDDecoOpHitFinderXArapuca
     opflashdecotpc0arapuca:   @local::SBNDDecoSimpleFlashTPC0Arapuca
     opflashdecotpc1arapuca:   @local::SBNDDecoSimpleFlashTPC1Arapuca
-
   }
 
   reco: [
     opdecopmt,
     ophitpmt,
     opflashtpc0,
-    opflashtpc1,
+    opflashtpc1
 
-    opdecoxarapuca,
-    ophitxarapuca,
-    opflashdecotpc0arapuca,
-    opflashdecotpc1arapuca
+    #opdecoxarapuca,
+    #ophitxarapuca,
+    #opflashdecotpc0arapuca,
+    #opflashdecotpc1arapuca
   ]
 
 

sbndcode/OpDetReco/OpDeconvolution/job/sbnd_flashfinder_deco.fcl

@@ -62,6 +62,7 @@ SBNDDecoSimpleFlashTPC0_realisticMC.OpHitInputTime: "RiseTime"
 SBNDDecoSimpleFlashTPC0_realisticMC.UseT0Tool: true
 SBNDDecoSimpleFlashTPC0_realisticMC.ReadoutDelay: 0 //cable time delay in us
 SBNDDecoSimpleFlashTPC0_realisticMC.CorrectLightPropagation: true
+SBNDDecoSimpleFlashTPC0_realisticMC.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_MC2.root"
 
 #TPC1
 SBNDDecoSimpleFlashTPC1_realisticMC: @local::SBNDSimpleFlashTPC1
@@ -73,7 +74,7 @@ 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"
+SBNDDecoSimpleFlashTPC1_realisticMC.DriftEstimatorConfig.CalibrationFile: "OpDetReco/PMTRatioCalibration_MC2.root"
 
 
 ###### XA IDEAL MC ######

sbndcode/OpDetReco/OpDeconvolution/job/sbnd_ophitfinder_deco.fcl

@@ -103,7 +103,5 @@ SBNDDecoOpHitFinderPMT_data.PedAlgoPset.Method:2
 
 #####OpHit finder for PMT deconvolved waveforms#####
 SBNDDecoOpHitFinderPMT_realisticMC: @local::SBNDDecoOpHitFinderPMT_data
-####SPE area must be 1./DecoWaveformPrecision
-SBNDDecoOpHitFinderPMT_realisticMC.InputModule: "pmtpulseoscillation"
 
-END_PROLOG
+END_PROLOG

sbndcode/OpDetSim/digi_pmt_sbnd.fcl

@@ -23,7 +23,7 @@ sbnd_digipmt_alg:
   CableTime:             135        #time delay of the 30 m long readout cable in ns
 
   # Digitizer simulation
-  PMTADCDynamicRange:    14745      #in ADC values
+  PMTADCDynamicRange:    14250      #in ADC values
   PMTBaseline:           14250      #in ADC
   PMTBaselineRMS:        2.6        #in ADC
 
@@ -35,13 +35,13 @@ sbnd_digipmt_alg:
   PMTDarkNoiseRate:      1000.0     #in Hz
 
   # Detection efficiencies
-  PMTCoatedVUVEff_tpc0:       0.0315      #PMT coated detection efficiency for direct (VUV) light
-  PMTCoatedVISEff_tpc0:       0.03493    #PMT coated detection efficiency for reflected (VIS) light
-  PMTUncoatedEff_tpc0:        0.03382   #PMT uncoated detection efficiency
+  PMTCoatedVUVEff_tpc0:       0.0392      #PMT coated detection efficiency for direct (VUV) light
+  PMTCoatedVISEff_tpc0:       0.026    #PMT coated detection efficiency for reflected (VIS) light
+  PMTUncoatedEff_tpc0:        0.0357   #PMT uncoated detection efficiency
 
-  PMTCoatedVUVEff_tpc1:       0.027      #PMT coated detection efficiency for direct (VUV) light
-  PMTCoatedVISEff_tpc1:       0.03493      #PMT coated detection efficiency for reflected (VIS) light
-  PMTUncoatedEff_tpc1:        0.03382      #PMT uncoated detection efficiency
+  PMTCoatedVUVEff_tpc1:       0.0392      #PMT coated detection efficiency for direct (VUV) light
+  PMTCoatedVISEff_tpc1:       0.026      #PMT coated detection efficiency for reflected (VIS) light
+  PMTUncoatedEff_tpc1:        0.0357      #PMT uncoated detection efficiency
 
   # Simulate gain fluctuations
   # (comment-out to skip gain fluctuations simulation)