Merge branch 'develop' into art-3.12-changes

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
 
 #project(duneana VERSION 09.48.00.d00 LANGUAGES CXX)
 project(duneana LANGUAGES CXX)
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.69.01d00)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.72.01d00)
 
 # cetbuildtools contains our cmake modules
 find_package(cetbuildtools REQUIRED)

duneana/AnaTree/AnalysisTree.fcl

@@ -83,13 +83,14 @@ dune10kt_analysistree.PandoraNuVertexModuleLabel: "pandora"
 dune10kt_analysistree.TrackModuleLabel: [ "pmtrack", "pmtracktc", "pandoraTrack", "pmtrajfit" ]
 dune10kt_analysistree.CalorimetryModuleLabel: [ "pmtrackcalo", "pmtracktccalo", "pandoracalo", "pmtrajfitcalo" ]
 dune10kt_analysistree.ParticleIDModuleLabel:       [ "pmtrackpid", "pmtracktcpid", "pandorapid", "pmtrajfitpid" ]
+SpacePointSolverModuleLabel: "spsolve"
 dune10kt_analysistree.FlashT0FinderLabel: [ "", "", "", "" ]
 dune10kt_analysistree.MCT0FinderLabel:   [ "", "", "", "" ]
 dune10kt_analysistree.CosmicTaggerAssocLabel:  [ "", "", "", "" ]
 dune10kt_analysistree.ContainmentTaggerAssocLabel: [ "", "", "", "" ]
 dune10kt_analysistree.FlashMatchAssocLabel: [ "", "", "", "" ]
 dune10kt_analysistree.VertexModuleLabel: [ "linecluster", "pmtrack", "pandora" ]
-dune10kt_analysistree.ShowerModuleLabel:          ["emshower"]
+dune10kt_analysistree.ShowerModuleLabel:          ["pandoraShower", "emshower"]
 dune10kt_analysistree.POTModuleLabel:             "generator"
 dune10kt_analysistree.SaveCryInfo:                false
 dune10kt_analysistree.SaveGenieInfo:              true

duneana/CMakeLists.txt

@@ -7,5 +7,6 @@ add_subdirectory(HitAnalysis)
 add_subdirectory(PandoraAnalysis)
 add_subdirectory(ProductFilters)
 add_subdirectory(ShowerAna)
+add_subdirectory(SolarNuAna)
 add_subdirectory(SupernovaAna)
-add_subdirectory(TrackingAna)
+add_subdirectory(TrackingAna)

duneana/SolarNuAna/CMakeLists.txt

@@ -0,0 +1,35 @@
+add_subdirectory(fcl)
+art_make(BASENAME_ONLY
+         MODULE_LIBRARIES
+         dunecore::DAQTriggerSim_TriggerDataProducts
+         larcore::Geometry_Geometry_service
+         lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
+         larcorealg::Geometry
+         lardataobj::RawData
+         nusimdata::SimulationBase
+         larsim::MCCheater_BackTrackerService_service
+         larsim::MCCheater_PhotonBackTrackerService_service
+         larsim::MCCheater_ParticleInventoryService_service
+         nug4::ParticleNavigation
+         ART_FRAMEWORK_CORE
+         ART_FRAMEWORK_PRINCIPAL
+         ART_FRAMEWORK_SERVICES_REGISTRY
+         ART_ROOT_IO_TFILE_SUPPORT
+         ROOT::Core
+         ART_ROOT_IO_TFILESERVICE_SERVICE
+         art::Persistency_Common
+         art::Persistency_Provenance
+         art::Utilities 
+	 canvas
+         ART_PERSISTENCY_COMMON
+         ART_PERSISTENCY_PROVENANCE
+         ART_UTILITIES
+         messagefacility::MF_MessageLogger
+         cetlib::cetlib 
+	 cetlib_except
+         ROOT_BASIC_LIB_LIST
+         )
+
+install_fhicl()
+install_headers()
+install_source()

duneana/SolarNuAna/fcl/CMakeLists.txt

@@ -0,0 +1,6 @@
+install_fhicl()
+
+# Also put a copy in the source tree.
+
+FILE(GLOB fcl_files *.fcl)
+install_source( EXTRAS ${fcl_files} )

duneana/SolarNuAna/fcl/SolarNuAna.fcl

@@ -0,0 +1,113 @@
+BEGIN_PROLOG
+
+solar_nu_ana_hd_v4:
+{
+  module_type:		     "SolarNuAna"
+  #================================================================================================
+
+  RawDigitLabel:       "daq"		      # string for the process that made the raw digits
+  HitLabel:		         "hitfd" 	      # string for the process that made the reco hits
+  GEANT4Label:         "largeant"     # The label for the process which ran GEANT4
+  OpFlashLabel:        "opflash"
+  OpHitLabel:          "ophit"
+
+  # Vector with generator labels for the particles included in the event. IMPORTANT: Keep MARLEY label in the first position!!!
+  ParticleLabelVector: ["marley","ar39Gen","ar42Gen","apaGen","cNeutronGen","cpaGen","kr85Gen","rn222Gen","po210Gen"]
+
+  PositionRecoMode:    "DEFAULT"     # Mode used in position reconstruction.
+  DetectorSizeY:       600           # Dont't change this value for HD unless you know what you are doing!!!
+
+  ClusterMatchMinNHit: 2             # DAQ Clusters min. hit requirement.
+  ClusterMatchTime:    20            # Time window to look for ind. plane clusters in [tick] units.
+  GoalInd0MatchTime:   10            # Goal Time to match clusters in ind. plane 0 in [tick] units. Needs to be calibrated for each geometry!
+  GoalInd1MatchTime:   5             # Goal Time to match clusters in ind. plane 1 in [tick] units. Needs to be calibrated for each geometry!
+
+  AdjClusterTime:      50            # Time window to search for adj. clusters in [ick] units.
+  AdjClusterRad:       100           # Radius to search for adj. clusters in [cm] units.
+
+  AdjOpFlashTime:      10000         # Time window to look for adjacent clusters in [tick] units.
+  AdjOpFlashRad:       250           # Radius to search for adj. OpFlashes reconstructed in [cm] units.
+  AdjOpFlashMaxPECut:  1.01          # Cut on the maximum PE OpHit contribution to the total OpFlash PE (lower limit).
+
+  TestNewClReco: false               # Use new cluster reco algorithm.
+  Debug: false
+}
+
+solar_nu_ana_hd_v2: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v2.ParticleLabelVector: ["marley","apa","neut","po","cpa","ar42","kr85","ar39","rn222"]
+
+solar_nu_ana_hd_v4_wbkg: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_wbkg.ParticleLabelVector: ["marley","apaGen","cNeutronGen","cpaGen","ar42Gen","kr85Gen","ar39Gen","rn222Gen","po210Gen"]
+
+solar_nu_ana_hd_v4_clean: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_clean.ParticleLabelVector: ["marley"]
+
+solar_nu_ana_hd_v4_ar39: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_ar39.ParticleLabelVector: ["marley","ar39Gen"]
+
+solar_nu_ana_hd_v4_ar42: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_ar42.ParticleLabelVector: ["marley","ar42Gen"]
+
+solar_nu_ana_hd_v4_apa: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_apa.ParticleLabelVector: ["marley","apaGen"]
+
+solar_nu_ana_hd_v4_neut: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_neut.ParticleLabelVector: ["marley","cNeutronGen"]
+
+solar_nu_ana_hd_v4_cpa: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_cpa.ParticleLabelVector: ["marley","cpaGen"]
+
+solar_nu_ana_hd_v4_kr85: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_kr85.ParticleLabelVector: ["marley","kr85Gen"]
+
+solar_nu_ana_hd_v4_rn222: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_rn222.ParticleLabelVector: ["marley","rn222Gen"]
+
+solar_nu_ana_hd_v4_po210: @local::solar_nu_ana_hd_v4
+solar_nu_ana_hd_v4_po210.ParticleLabelVector: ["marley","po210Gen"]
+
+solar_nu_ana_vd: @local::solar_nu_ana_hd_v4
+solar_nu_ana_vd.HitLabel:            "gaushit"
+solar_nu_ana_vd.OpFlashLabel:        "opflash10ppm"
+solar_nu_ana_vd.OpHitLabel:          "ophit10ppm"
+solar_nu_ana_vd.OpDetWaveformLabel:  "opdigi10ppm"
+solar_nu_ana_vd.ParticleLabelVector: ["marley","Ar39GenInLAr","Kr85GenInLAr","Ar42GenInLAr","K42From42ArGenInLAr","Rn222ChainGenInLAr","K42From42ArGenInCPA","K40inGenInCPA","U238ChainGenInCPA","Rn222ChainGenInPDS","NeutronGenInRock","GammasGenInRock"]
+solar_nu_ana_vd.DetectorSizeY:       1500 
+
+solar_nu_ana_vd_clean: @local::solar_nu_ana_vd
+solar_nu_ana_vd_clean.ParticleLabelVector: ["marley"]
+
+solar_nu_ana_vd_ar39: @local::solar_nu_ana_vd
+solar_nu_ana_vd_ar39.ParticleLabelVector: ["marley","Ar39GenInLAr"]
+
+solar_nu_ana_vd_kr85: @local::solar_nu_ana_vd
+solar_nu_ana_vd_kr85.ParticleLabelVector: ["marley","Kr85GenInLAr"]
+
+solar_nu_ana_vd_ar42: @local::solar_nu_ana_vd
+solar_nu_ana_vd_ar42.ParticleLabelVector: ["marley","Ar42GenInLAr"]
+
+solar_nu_ana_vd_k42: @local::solar_nu_ana_vd
+solar_nu_ana_vd_k42.ParticleLabelVector: ["marley","K42From42ArGenInLAr"]
+
+solar_nu_ana_vd_rn222: @local::solar_nu_ana_vd
+solar_nu_ana_vd_rn222.ParticleLabelVector: ["marley","Rn222ChainGenInLAr"]
+
+solar_nu_ana_vd_k42cpa: @local::solar_nu_ana_vd
+solar_nu_ana_vd_k42cpa.ParticleLabelVector: ["marley","K42From42ArGenInCPA"]
+
+solar_nu_ana_vd_k40cpa: @local::solar_nu_ana_vd
+solar_nu_ana_vd_k40cpa.ParticleLabelVector: ["marley","K40inGenInCPA"]
+
+solar_nu_ana_vd_u238cpa: @local::solar_nu_ana_vd
+solar_nu_ana_vd_u238cpa.ParticleLabelVector: ["marley","U238ChainGenInCPA"]
+
+solar_nu_ana_vd_rn222pds: @local::solar_nu_ana_vd
+solar_nu_ana_vd_rn222pds.ParticleLabelVector: ["marley","Rn222ChainGenInPDS"]
+
+solar_nu_ana_vd_neut: @local::solar_nu_ana_vd
+solar_nu_ana_vd_neut.ParticleLabelVector: ["marley","NeutronGenInRock"]
+
+solar_nu_ana_vd_gamma: @local::solar_nu_ana_vd
+solar_nu_ana_vd_gamma.ParticleLabelVector: ["marley","GammasGenInRock"]
+
+END_PROLOG

duneana/SolarNuAna/fcl/solarnuana_hd_v2_wbkg_job.fcl

@@ -0,0 +1,57 @@
+// solarnuana_hd_job.fcl
+//
+// Run SolarNuAna on the output of offline hit finders
+
+#include "SolarNuAna.fcl"
+#include "services_dune.fcl"
+
+process_name: SolarNuAna
+
+services:
+{
+  @table::dunefd_services
+  TFileService:          { fileName: "SolarNuAna_hd_v2_wbkg_hist.root" }
+  TimeTracker:           {}
+  MemoryTracker:         {} # default is one
+  RandomNumberGenerator: {} #ART native random number generator
+  FileCatalogMetadata:   @local::art_file_catalog_mc
+  Geometry:              @local::dune10kt_1x2x6_geo
+  @table::dunefd_simulation_services
+}
+
+# a temporary fix until the photon back tracker gets fixed...
+#services.PhotonBackTrackerService:	@erase
+
+physics:
+{ 
+  analyzers:
+  {
+    solarnuana:     @local::solar_nu_ana_hd_v2
+  }
+  ana: [ solarnuana ]
+  end_paths: [ ana ] 
+}
+
+source:
+{
+  module_type: RootInput
+  maxEvents:  -1      # Number of events to create
+}
+
+outputs:
+{
+  out1:
+  {
+    module_type: RootOutput
+    fileName:    "%ifb_solar.root"
+    dataTier:    "analized"
+    compressionLevel: 1
+  }
+}
+
+# Activate for mcc11 data!!!
+services.Geometry.GDML: "dune10kt_v2_1x2x6.gdml"
+services.Geometry.Name: "dune10kt_v2_1x2x6"
+services.Geometry.ROOT: "dune10kt_v2_1x2x6.gdml"
+
+# physics.analyzers.daqanafasth.HitLabel: "fasthit"	# string for the process that made the fast hits

duneana/SolarNuAna/fcl/solarnuana_hd_v4_apa_job.fcl

@@ -0,0 +1,53 @@
+// solarnuana_hd_job.fcl
+//
+// Run SolarNuAna on the output of offline hit finders
+
+#include "SolarNuAna.fcl"
+#include "services_dune.fcl"
+
+process_name: SolarNuAna
+
+services:
+{
+  @table::dunefd_services
+  TFileService:          { fileName: "SolarNuAna_hd_v4_apa_hist.root" }
+  TimeTracker:           {}
+  MemoryTracker:         {} # default is one
+  RandomNumberGenerator: {} #ART native random number generator
+  FileCatalogMetadata:   @local::art_file_catalog_mc
+  Geometry:              @local::dune10kt_1x2x6_geo
+  @table::dunefd_simulation_services
+}
+
+# a temporary fix until the photon back tracker gets fixed...
+#services.PhotonBackTrackerService:	@erase
+
+physics:
+{ 
+  analyzers:
+  {
+    solarnuana: @local::solar_nu_ana_hd_v4_apa
+  }
+  ana: [ solarnuana ]
+  end_paths: [ ana ] 
+}
+
+source:
+{
+  module_type: RootInput
+  maxEvents:  -1      # Number of events to create
+}
+
+outputs:
+{
+  out1:
+  {
+    module_type: RootOutput
+    fileName:    "%ifb_solar.root"
+    dataTier:    "analized"
+    compressionLevel: 1
+  }
+}
+services.Geometry.GDML: "dune10kt_v4_1x2x6.gdml"
+services.Geometry.Name: "dune10kt_v4_1x2x6"
+services.Geometry.ROOT: "dune10kt_v4_1x2x6.gdml"

duneana/SolarNuAna/fcl/solarnuana_hd_v4_ar39_job.fcl

@@ -0,0 +1,53 @@
+// solarnuana_hd_job.fcl
+//
+// Run SolarNuAna on the output of offline hit finders
+
+#include "SolarNuAna.fcl"
+#include "services_dune.fcl"
+
+process_name: SolarNuAna
+
+services:
+{
+  @table::dunefd_services
+  TFileService:          { fileName: "SolarNuAna_hd_v4_ar39_hist.root" }
+  TimeTracker:           {}
+  MemoryTracker:         {} # default is one
+  RandomNumberGenerator: {} #ART native random number generator
+  FileCatalogMetadata:   @local::art_file_catalog_mc
+  Geometry:              @local::dune10kt_1x2x6_geo
+  @table::dunefd_simulation_services
+}
+
+# a temporary fix until the photon back tracker gets fixed...
+#services.PhotonBackTrackerService:	@erase
+
+physics:
+{ 
+  analyzers:
+  {
+    solarnuana: @local::solar_nu_ana_hd_v4_ar39
+  }
+  ana: [ solarnuana ]
+  end_paths: [ ana ] 
+}
+
+source:
+{
+  module_type: RootInput
+  maxEvents:  -1      # Number of events to create
+}
+
+outputs:
+{
+  out1:
+  {
+    module_type: RootOutput
+    fileName:    "%ifb_solar.root"
+    dataTier:    "analized"
+    compressionLevel: 1
+  }
+}
+services.Geometry.GDML: "dune10kt_v4_1x2x6.gdml"
+services.Geometry.Name: "dune10kt_v4_1x2x6"
+services.Geometry.ROOT: "dune10kt_v4_1x2x6.gdml"