Merge branch 'develop' of github.com:SBNSoftware/sbndcode into bugfix/acastill_barycenterfm_label

Author: asanchezcastillo

CMakeLists.txt

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

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

@@ -34,6 +34,7 @@ sbnd_reco2_producers:{
     pandoraCalo:         @local::sbnd_gnewcalomc
     pandoraPid:          @local::sbnd_chi2pid
 
+
     pandoraSCECalo:      @local::sbnd_gnewcalomc
     pandoraSCEPid:       @local::sbnd_chi2pid
 
@@ -49,6 +50,7 @@ sbnd_reco2_producers:{
     pandoraSCEShower:    @local::sbnd_sce_incremental_pandoraModularShowerCreation
     pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation
 
+
     ### CRT Veto
     crtveto:        @local::crtvetoproducer_sbnd
 

sbndcode/JobConfigurations/standard/reco/reco2_data.fcl

@@ -25,6 +25,14 @@ physics.producers:
     opt0finderSCE:  @local::sbnd_opt0_finder_data
     tpcpmtbarycentermatching: @local::TPCPMTBarycenterMatchProducer
     tpcpmtbarycentermatchingSCE: @local::TPCPMTBarycenterMatchProducerSCE
+
+    ### shower reco for data
+    pandoraShower:       @local::sbnd_incremental_pandoraModularShowerCreationData
+    pandoraShowerSBN:    @local::sbnd_sbn_pandoraModularShowerCreationData
+    ### SCE-aware shower reco for data
+    pandoraSCEShower:    @local::sbnd_sce_incremental_pandoraModularShowerCreationData
+    pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreationData
+ 
 }
 
 physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, 
@@ -49,6 +57,10 @@ physics.producers.opt0finderSCE.SliceProducer:    "pandoraSCE"
 physics.producers.opt0finderSCE.TrackProducer:    "pandoraSCETrack"
 physics.producers.opt0finderSCE.ShowerProducer:   "pandoraSCEShowerSBN"
 physics.producers.opt0finderSCE.CaloProducer:     "pandoraSCECaloData"
+physics.producers.pandoraSCEShower.PFParticleLabel:              "pandoraSCE"
+physics.producers.pandoraSCEShowerSBN.PFParticleLabel:           "pandoraSCE"
+
+
 
 physics.caloskimana: [ caloskim, crtana ]
 physics.end_paths: [stream1, caloskimana ]

sbndcode/SBNDPandora/pandoramodules_sbnd.fcl

@@ -133,6 +133,11 @@ sbnd_incremental_pandoraModularShowerCreation.ShowerFinderTools[8].ShowerDirecti
 sbnd_incremental_pandoraModularShowerCreation.ShowerFinderTools[9].FirstDirectionInputLabel: "TrajDirection"
 sbnd_incremental_pandoraModularShowerCreation.ShowerFinderTools[9].SecondDirectionInputLabel: "ShowerDirection"
 
+sbnd_incremental_pandoraModularShowerCreationData: @local::sbnd_incremental_pandoraModularShowerCreation
+sbnd_incremental_pandoraModularShowerCreationData.ShowerFinderTools[3].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+sbnd_incremental_pandoraModularShowerCreationData.ShowerFinderTools[4].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+sbnd_incremental_pandoraModularShowerCreationData.ShowerFinderTools[7].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+
 sbnd_cheat_pandoraModularShowerCreation.ShowerFinderTools: [
   @local::sbnd_showerstartpositioncheater,
   @local::sbnd_showerdirectioncheater,
@@ -156,6 +161,11 @@ sbnd_sce_incremental_pandoraModularShowerCreation: @local::sbnd_incremental_pand
 sbnd_sce_3dTraj_pandoraModularShowerCreation.ShowerFinderTools[7]:      @local::sbnd_sce_showertrajpointdedx
 sbnd_sce_incremental_pandoraModularShowerCreation.ShowerFinderTools[7]: @local::sbnd_sce_showertrajpointdedx
 
+sbnd_sce_incremental_pandoraModularShowerCreationData: @local::sbnd_sce_incremental_pandoraModularShowerCreation
+sbnd_sce_incremental_pandoraModularShowerCreationData.ShowerFinderTools[3].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+sbnd_sce_incremental_pandoraModularShowerCreationData.ShowerFinderTools[4].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+sbnd_sce_incremental_pandoraModularShowerCreationData.ShowerFinderTools[7].CalorimetryAlg: @local::sbnd_calorimetryalgdata
+
 # SBND config of the sbn common tool set
 sbnd_sbn_showertrajpointdedx:     @local::sbnd_showertrajpointdedx
 sbnd_sce_sbn_showertrajpointdedx: @local::sbnd_sce_showertrajpointdedx
@@ -169,4 +179,15 @@ sbnd_sce_sbn_pandoraModularShowerCreation:  @local::sbnd_3dTraj_pandoraModularSh
 sbnd_sbn_pandoraModularShowerCreation.ShowerFinderTools[7]:      @local::sbnd_sbn_showertrajpointdedx
 sbnd_sce_sbn_pandoraModularShowerCreation.ShowerFinderTools[7]:  @local::sbnd_sce_sbn_showertrajpointdedx
 
+sbnd_sbn_pandoraModularShowerCreationData: @local::sbnd_sbn_pandoraModularShowerCreation
+sbnd_sbn_pandoraModularShowerCreationData.ShowerFinderTools[3].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+sbnd_sbn_pandoraModularShowerCreationData.ShowerFinderTools[5].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+sbnd_sbn_pandoraModularShowerCreationData.ShowerFinderTools[7].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+
+sbnd_sce_sbn_pandoraModularShowerCreationData:  @local::sbnd_sce_sbn_pandoraModularShowerCreation
+sbnd_sce_sbn_pandoraModularShowerCreationData.ShowerFinderTools[3].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+sbnd_sce_sbn_pandoraModularShowerCreationData.ShowerFinderTools[5].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+sbnd_sce_sbn_pandoraModularShowerCreationData.ShowerFinderTools[7].CalorimetryAlg:  @local::sbnd_calorimetryalgdata
+
+
 END_PROLOG