Merge pull request #461 from SBNSoftware/release/SBN2024A

fjnicolas · web-flow · commit 1e89991b0230 · 2024-04-29T18:21:19.000+02:00
SBN2024A to develop
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.88.00.03)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.89.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.88.00.03)
+# project(sbndcode VERSION 09.89.01)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")
diff --git a/sbndcode/JobConfigurations/base/reco_sbnd.fcl b/sbndcode/JobConfigurations/base/reco_sbnd.fcl
@@ -256,6 +256,7 @@ physics:
   crtskim: @local::crtskim_sbnd
   pmtskim: @local::pmtskim_sbnd
   supera: @local::sbnd_supera
+  superampvmpr: @local::sbnd_supera_mpvmpr
  }
 
  caloskimana: [ caloskim, crtskim, pmtskim ]
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl
@@ -2,14 +2,17 @@
 
 #include "standard_g4_sbnd.fcl"
 
+# Set proper input tags for mcreco
+physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped"
+
 physics.simulate: [ rns
                   , sedlite #SEDLite reduces info from SED
                   , ionandscint
                   , ionandscintout
                   , pdfastsim
                   , pdfastsimout
                   # , simdrift ## 1D TPC simulation no longer run
-                  #, mcreco ## mcreco now run after WireCell sim
+                  , mcreco
                   , genericcrt
                   ]
 
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_enterstpc_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_enterstpc_filter.fcl
@@ -13,7 +13,7 @@ physics.simulate: [ rns
                   , pdfastsimout
                   # , simdrift #1D drift sim no longer run
                   , filter # Adding filter
-                  # , mcreco #mc reco added to detsim
+                  , mcreco
                 ]
 
 
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_mu_crt_filter_base.fcl b/sbndcode/JobConfigurations/standard/g4/g4_mu_crt_filter_base.fcl
@@ -14,7 +14,7 @@ physics.simulate: [ rns
                   , pdfastsimout
                 #   , simdrift #1D drift sim no longer run
                   , filter # Adding filter
-                #   , mcreco #mc reco added to detsim
+                  , mcreco
                   , genericcrt
                  ]
 
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_sce_simphotontime_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_sce_simphotontime_filter.fcl
@@ -37,5 +37,5 @@ physics.simulate: [ rns
                   , pdfastsimout
                   , genericcrt
                   ### Do truth-level reconstruction
-                #   , mcreco
+                  , mcreco
                   ]
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl
@@ -81,6 +81,9 @@ physics.producers.largeantdropped.InputSourcesLabels: [ "larg4intime:droppedMCPa
 # Change simple merge inputs since we're using an overlay sample
 physics.producers.simplemerge.InputSourcesLabels: ["largeant", "largeantdropped"]
 
+# Set proper input tags for mcreco
+physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped"
+
 # Add all these new modules to the simulate path
 physics.simulate: [ rns
                   ### Complete intime drift simulation and generic CRT
@@ -109,7 +112,7 @@ physics.simulate: [ rns
                   , pdfastsimout
                   , genericcrt
                   ### Do truth-level reconstruction
-                #   , mcreco
+                   , mcreco
                   ]
 
 services.ParticleListAction.keepGenTrajectories: ["GenInTimeSorter"]
diff --git a/sbndcode/JobConfigurations/standard/gen/MultiPart/multipartvertex_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/MultiPart/multipartvertex_sbnd.fcl
@@ -3,43 +3,59 @@ BEGIN_PROLOG
 MultiPartVertex : {
     module_type  : "MultiPartVertex"
     DebugMode    : 0
-    G4Time       : 340.8
-    G4TimeJitter : 1.6
+    G4Time       : 819.2 # [ns]
+    G4TimeJitter : 1.6 # [ns]
     TPCRange     : [[0,0],[0,1]]
     XRange       : [30,30]
     YRange       : [30,30]
     ZRange       : [30,30]
-    MultiMax     : 6
+    MultiMax     : 7
     MultiMin     : 2
+    GammaBetaRange : [0.0, 3.0]
+    Revert       : 0
+    UseBoost     : 0
     ParticleParameter: {
-        PDGCode      : [   [-11,11,-13,13], [111], [211,-211],   [2212]]
-        MinMulti     : [         1,         0,          0,        0]
-        MaxMulti     : [         1,         2,          2,        4]
-        ProbWeight   : [         3,         1,          1,        3]
-        KERange      : [ [0.05,0.8], [0.05,0.4], [0.05,0.4],  [0.05,0.4]]
+        PDGCode      : [   [-11,11,-13,13], [111], [211,-211],   [2212],  [22]]
+        MinMulti     : [         0,         0,          0,        0,       0]
+        MaxMulti     : [         1,         2,          2,        4,       2]
+        ProbWeight   : [         3,         1,          1,        3,       1]
+        KERange      : [ [0.0,3.0], [0.0,1.0], [0.0,1.0],  [0.0,1.0], [0.0,1.0]]
         MomRange     : []
     }
 }
 
 MultiPartRain : {
     module_type  : "MultiPartRain"
     DebugMode    : 0
-    G4Time       : 819.2 # [us]
-    G4TimeJitter : 1638.4 # [us]
+    G4Time       : 819.2 # [ns]
+    G4TimeJitter : 1638.4 # [ns]
     TPCRange     : [[0,0],[0,1]]
     XRange       : [20,20]
     YRange       : [20,20]
     ZRange       : [20,20]
-    MultiMax     : 15
-    MultiMin     : 8
+    DirectInward : true
+    CosmicDistribution : false
+    MultiMax     : 5
+    MultiMin     : 3
     ParticleParameter: {
-        PDGCode      : [   [-13,13],      [11,22],   [2212]]
-        MinMulti     : [         0,         0,          0]
-        MaxMulti     : [         15,         5,          15]
-        ProbWeight   : [         5,         1,          1]
-        KERange      : [ [0.05,1.0],   [0.05,0.1], [0.05,0.4]]
+        PDGCode      : [   [-13,13],   [-13,13],      [11,-11],     [22],     [2212]]
+        MinMulti     : [         0,         0,          0,          0,         0]
+        MaxMulti     : [         5,         5,          2,          3,         5]
+        ProbWeight   : [         5,         5,          1,          2,         1]
+        KERange      : [ [0.0,20.0],   [0.0,2.0],  [0.0,1.0],  [0.0,1.0],  [0.0,1.0]]
         MomRange     : []
     }
 }
 
+MultiPartRain2 : @local::MultiPartRain
+MultiPartRain2.G4Time: -50000 # [ns]
+MultiPartRain2.G4TimeJitter: 2900000 # [ns]
+MultiPartRain2.MultiMax: 4
+MultiPartRain2.MultiMin: 2
+MultiPartRain2.ParticleParameter.PDGCode      : [   [-13,13], [-13,13],     [2212]]
+MultiPartRain2.ParticleParameter.MinMulti     : [          0,        0,          0]
+MultiPartRain2.ParticleParameter.MaxMulti     : [          5,        5,          5]
+MultiPartRain2.ParticleParameter.ProbWeight   : [          5,        5,          1]
+MultiPartRain2.ParticleParameter.KERange      : [ [0.0,20.0], [0.0,2.0], [0.0,1.0]]
+
 END_PROLOG
diff --git a/sbndcode/JobConfigurations/standard/gen/MultiPart/run_mpvmpr_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/MultiPart/run_mpvmpr_sbnd.fcl
@@ -33,9 +33,10 @@ physics:
         rns:       { module_type: "RandomNumberSaver" }
         generator: @local::MultiPartVertex
         rain:      @local::MultiPartRain
+        rain2:     @local::MultiPartRain2
     }
 
-    simulate: [ rns, generator, rain]
+    simulate: [ rns, generator, rain, rain2]
     out_stream: [ out1   ]
 
     trigger_paths: [simulate]
diff --git a/sbndcode/JobConfigurations/standard/reco/reco1_sce_mpvmpr_lite.fcl b/sbndcode/JobConfigurations/standard/reco/reco1_sce_mpvmpr_lite.fcl
@@ -4,4 +4,4 @@
 
 #include "reco1_sce_lite.fcl"
 
-physics.analyzers.supera: @local::sbnd_supera_mpvmpr
+physics.superaana: [superampvmpr]
diff --git a/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl
@@ -12,7 +12,6 @@
 # - recob::Wire (TPC signals per channel)
 # - sim::SimChannel (Simulated electrons per channel)
 # - OpDetWaveforms (optical waveforms)
-# - MCReco -> MCTrack, MCShower: deposited energy from each MCParticle (needs SimChannels)
 
 #
 # Dependencies:
@@ -33,7 +32,6 @@
 #include "wcsimsp_sbnd.fcl"
 #include "crtsimmodules_sbnd.fcl"
 #include "opdetdigitizer_sbnd.fcl"
-#include "mcreco_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 
 
@@ -67,11 +65,10 @@ physics:
     simtpc2d:  @local::sbnd_wcls_simsp 
     crtsim:    @local::sbnd_crtsim
     opdaq:     @local::sbnd_opdetdigitizer
-    mcreco:    @local::sbnd_mcreco
   }
 
   #define the producer and filter modules for this path, order matters,
-  simulate: [rns, simtpc2d, crtsim, opdaq, mcreco]
+  simulate: [rns, simtpc2d, crtsim, opdaq]
 
   #define the output stream, there could be more than one if using filters
   stream1:   [ out1 ]
diff --git a/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl b/sbndcode/JobConfigurations/standard/standard_g4_sbnd.fcl
@@ -14,6 +14,7 @@
 #   * SimPhoton or SimPhotonLite (photons at the optical detectors)
 # - GenericCRT: produces:
 #   * AuxDetSimChannels (from LArG4 AuxDetHits)
+# - MCReco -> MCTrack, MCShower: deposited energy from each MCParticle (needs SimChannels)
 #
 # Input: a file with generated particles; all MCTruth data products in the input
 #        file are processed.
@@ -32,7 +33,7 @@
 #include "ionandscint_sbnd.fcl"
 #include "PDFastSim_sbnd.fcl"
 # include "simdrift_sbnd.fcl"
-# include "mcreco_sbnd.fcl"
+#include "mcreco_sbnd.fcl"
 #include "rootoutput_sbnd.fcl"
 #include "config_genericCRT.fcl"
 
@@ -86,7 +87,7 @@ physics:
     # simdrift: @local::sbnd_simdrift
 
     # Truth-level reconstruction
-    # mcreco: @local::sbnd_mcreco
+    mcreco: @local::sbnd_mcreco
 
     # Generic CRT
     genericcrt: @local::sbnd_genericCRT
@@ -106,7 +107,7 @@ physics:
             , pdfastsim
             , pdfastsimout
             # , simdrift ## 1D TPC simulation no longer run
-            #, mcreco ## mcreco now run after WireCell sim
+            , mcreco
             , genericcrt
           ]
 
diff --git a/sbndcode/LArG4/mcreco_sbnd.fcl b/sbndcode/LArG4/mcreco_sbnd.fcl
@@ -4,8 +4,13 @@ BEGIN_PROLOG
 
 sbnd_mcreco: @local::standard_mcreco
 sbnd_mcreco.MCParticleLabel: "largeant"
-sbnd_mcreco.SimChannelLabel: "simtpc2d:simpleSC"
-sbnd_mcreco.MCRecoPrt.SavePathPDGList: [13,-13,211,-211,111,311,310,130,321,-321,2212,2112,2224,2214,2114,1114,3122,1000010020,1000010030,1000020030,1000020040]
+#Include dropped particles to fill in their ancestry
+sbnd_mcreco.MCParticleDroppedLabel: "largeant:droppedMCParticles"
+sbnd_mcreco.IncludeDroppedParticles: true
+#Use sedlite for energy depositions
+sbnd_mcreco.SimChannelLabel: "sedlite"
+sbnd_mcreco.UseSimEnergyDepositLite: true
+sbnd_mcreco.MCRecoPart.SavePathPDGList: [13,-13,211,-211,111,311,310,130,321,-321,2212,2112,2224,2214,2114,1114,3122,1000010020,1000010030,1000020030,1000020040]
 sbnd_mcreco.MCRecoPart.TrackIDOffsets: [0,10000000,20000000] #Account for track ID offsets in labeling primaries
 
 END_PROLOG
diff --git a/sbndcode/Trigger/PMT/pmtArtdaqFragmentProducer.fcl b/sbndcode/Trigger/PMT/pmtArtdaqFragmentProducer.fcl
@@ -5,7 +5,7 @@ pmtArtdaqFragmentProducer:
   module_type: "pmtArtdaqFragmentProducer"
   InputModuleNameWvfm: "opdaq"
   InputModuleNameTrigger: "pmttriggerproducer"
-  Baseline: 8000
+  Baseline: 14745 # new baseline
   MultiplicityThreshold: 10
   BeamWindowLength: 1.8 # us, extended by 0.2us to account for delayed signals
   nChannelsFrag: 15
diff --git a/sbndcode/Trigger/PMT/pmtsoftwaretriggerproducer.fcl b/sbndcode/Trigger/PMT/pmtsoftwaretriggerproducer.fcl
@@ -17,8 +17,8 @@ pmtSoftwareTriggerProducer:
   FindPulses:         false  # if true, will use crude pulse finding algorithm 
 
   # metric input parameters 
-  InputBaseline: [8000.0, 2.0] # in ADC, used if CalculateBaseline is FALSE // first entry is baseline, second entry is baseline error 
-  ADCThreshold:  7960          # in ADC, corresponds to ~5 PE in ideal response, used for CountPMTs (above threshold)  
+  InputBaseline: [14745, 2.0] # in ADC, used if CalculateBaseline is FALSE // first entry is baseline, second entry is baseline error 
+  ADCThreshold:  14705          # in ADC, corresponds to ~5 PE in ideal response, used for CountPMTs (above threshold) **not tuned**
   PEArea:        66.33         # conversion factor from ADCxns area to PE count **not tuned** 
 }
 
diff --git a/sbndcode/Trigger/PMT/pmttriggerproducer.fcl b/sbndcode/Trigger/PMT/pmttriggerproducer.fcl
@@ -9,7 +9,7 @@ pmtTriggerProducer:
   ClusterModuleLabel: "linecluster"
   OpDetsToPlot: ["pmt_coated", "pmt_uncoated"]
   IndividualThresholds: false #if true, Threshold needs to be a 120 element array of each individual PMT ADC threshold in order of lowest to highest channel number
-  Threshold: [7960.0, 7976.0] #[coated, uncoated], unless IndividualThresholds is true
+  Threshold: [14705.0, 14721.0] # [coated, uncoated], unless IndividualThresholds is true *not tuned*
   #ADC, ideal single PE response: 1 PE ~ 8 ADC, test bench: 1 PE ~ 25 ADC
   OVTHRWidth: 11 #over-threshold width, page 40 of manual
   #paired and unpaired pmt channel numbers, to pair two channels put them at the same index in Pair1 and Pair2
diff --git a/sbndcode/Trigger/PMT/run_pmtArtdaqFragmentProducer.fcl b/sbndcode/Trigger/PMT/run_pmtArtdaqFragmentProducer.fcl
@@ -48,6 +48,3 @@ physics:
  end_paths: [ stream1 ]
 
 }
-
-physics.producers.fragmentProducer.MultiplicityThreshold: 10
-physics.producers.fragmentProducer.BeamWindowLength: 1.8
diff --git a/sbndcode/Trigger/PMT/run_pmtsoftwaretriggerproducer.fcl b/sbndcode/Trigger/PMT/run_pmtsoftwaretriggerproducer.fcl
@@ -1,5 +1,5 @@
 #include "resourcemonitorservices_sbnd.fcl"
-
+#include "rootoutput_sbnd.fcl"
 #include "pmtsoftwaretriggerproducer.fcl"
 
 process_name: pmtSoftwareTriggerProducer
@@ -22,8 +22,8 @@ outputs:
 {
  out1:
  {
-   module_type: RootOutput
-   fileName:    "test.root" #default file name, can override from command line with -o or --output
+   @table::sbnd_rootoutput
+   #fileName:    "test.root" #default file name, can override from command line with -o or --output
    fastCloning: true
  }
 }
@@ -45,5 +45,3 @@ physics:
  end_paths: [ stream1]
 
 }
-
-physics.producers.pmtSoftwareTrigger.BeamWindowLength: 1.8
diff --git a/sbndcode/Trigger/PMT/run_pmttriggerproducer.fcl b/sbndcode/Trigger/PMT/run_pmttriggerproducer.fcl
@@ -111,7 +111,7 @@ physics:
 ### Some potential overwrites below
 
 #physics.producers.pmttriggerproducer.SaveHists: true
-physics.producers.pmttriggerproducer.Verbose: true
+#physics.producers.pmttriggerproducer.Verbose: true
 
 #physics.producers.pmttriggerproducer.PairLogic: "AND"
 
diff --git a/ups/product_deps b/ups/product_deps
@@ -253,10 +253,10 @@ wpdir   product_dir     wire-cell-cfg
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-sbncode		v09_88_00_03       -
+sbncode		v09_89_01       -
 cetmodules	v3_24_01	-	only_for_build
 sbnd_data	v01_24_00	-	optional
-sbndutil	v09_88_00_02	-	optional
+sbndutil	v09_89_01	-	optional
 end_product_list
 ####################################
 

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,7 @@ physics:`
`256`	`256`	`crtskim: @local::crtskim_sbnd`
`257`	`257`	`pmtskim: @local::pmtskim_sbnd`
`258`	`258`	`supera: @local::sbnd_supera`
	`259`	`+ superampvmpr: @local::sbnd_supera_mpvmpr`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`caloskimana: [ caloskim, crtskim, pmtskim ]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ physics.simulate: [ rns`
`13`	`13`	`, pdfastsimout`
`14`	`14`	`# , simdrift #1D drift sim no longer run`
`15`	`15`	`, filter # Adding filter`
`16`		`- # , mcreco #mc reco added to detsim`
	`16`	`+ , mcreco`
`17`	`17`	`]`
`18`	`18`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ physics.simulate: [ rns`
`14`	`14`	`, pdfastsimout`
`15`	`15`	`# , simdrift #1D drift sim no longer run`
`16`	`16`	`, filter # Adding filter`
`17`		`- # , mcreco #mc reco added to detsim`
	`17`	`+ , mcreco`
`18`	`18`	`, genericcrt`
`19`	`19`	`]`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ physics.simulate: [ rns`
`37`	`37`	`, pdfastsimout`
`38`	`38`	`, genericcrt`
`39`	`39`	`### Do truth-level reconstruction`
`40`		`- # , mcreco`
	`40`	`+ , mcreco`
`41`	`41`	`]`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`#include "reco1_sce_lite.fcl"`
`6`	`6`
`7`		`-physics.analyzers.supera: @local::sbnd_supera_mpvmpr`
	`7`	`+physics.superaana: [superampvmpr]`