Merge branch 'develop' into jsoto_pdhdworkflow

fcl/dunefd/gen/atm/prodgenie_atmnu_max_weighted_dune10kt_1x2x6.fcl

@@ -12,10 +12,4 @@ services:
 
 source.firstRun: 20000063
 
-physics.producers.generator: @local::dune_fd_genie_atmo_max_weighted_honda
-physics.producers.generator.EventsPerSpill: 1
-physics.producers.generator.POTPerSpill: 0
-# reduce the flux window to increase generation efficiency;
-# see `genie_dune.fcl` (or, better, GENIE manual) for explanations
-physics.producers.generator.Rl: 20 # meters
-physics.producers.generator.Rt: 20 # meters
+physics.producers.generator: @local::dune_fd_genie_atmo_max_weighted_honda

fcl/dunefdvd/gen/CMakeLists.txt

@@ -2,7 +2,7 @@ add_subdirectory(single)
 add_subdirectory(genie)
 add_subdirectory(cosmic)
 add_subdirectory(supernova)
-#add_subdirectory(atm)
+add_subdirectory(atm)
 add_subdirectory(ndk)
 add_subdirectory(background)
 add_subdirectory(solar)

fcl/dunefdvd/gen/atm/CMakeLists.txt

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

fcl/dunefdvd/gen/atm/prodgenie_atmnu_max_weighted_dunevd10kt_1x8x6_3view_30deg.fcl

@@ -0,0 +1,26 @@
+#include "prodgenie_common_dunevd10kt.fcl"
+
+process_name: GenieGen
+
+services:
+{
+    @table::services
+    @table::dunefdvd_1x8x6_3view_30deg_simulation_services
+}
+
+# remove some services that were configured but are useless in generation:
+services.ChannelGroupService:      @erase
+services.ChannelStatusService:     @erase
+services.DatabaseUtil:             @erase
+services.ParticleInventoryService: @erase
+services.BackTrackerService:       @erase
+services.PhotonBackTrackerService: @erase
+services.LArFFT:                   @erase
+services.SignalShapingServiceDUNE: @erase
+services.SpaceCharge:              @erase
+
+
+outputs.out1.fileName: "prodgenie_atmnu_max_weighted_dunevd10kt_1x8x6_3view_30deg_gen.root"
+source.firstRun: 20000063
+
+physics.producers.generator: @local::dune_fdvd_genie_atmo_max_weighted_honda

fcl/dunefdvd/gen/atm/prodgenie_atmnu_max_weighted_randompolicy_dunevd10kt_1x8x6_3view_30deg.fcl

@@ -0,0 +1,3 @@
+#include "prodgenie_atmnu_max_weighted_dunevd10kt_1x8x6_3view_30deg.fcl"
+
+services.NuRandomService: @local::random_NuRandomService #Using the random rng policy

fcl/protodunevd/gen/gen_protodunevd_muon_1GeV.fcl

@@ -0,0 +1,75 @@
+#include "services_refactored_pdune.fcl"
+#include "singles_dune.fcl"
+#include "corsika_protodune.fcl"
+#include "CORSIKAGendp.fcl"
+#include "dune_radiological_model.fcl"
+#include "gen_protodunevd_singlep.fcl"
+
+process_name: SinglesGen
+
+services:
+{
+  # Load the service that manages root files for histograms.
+  TFileService: { fileName: "gensingle_protoDUNE_hist.root" }
+  TimeTracker:       @local::dune_time_tracker
+  MemoryTracker:     @local::dune_memory_tracker
+  RandomNumberGenerator: {} #ART native random number generator
+  FileCatalogMetadata:  @local::art_file_catalog_mc
+  @table::protodunevd_refactored_simulation_services
+}
+
+#Start each new event with an empty event.
+source:
+{
+  module_type: EmptyEvent
+  timestampPlugin: { plugin_type: "GeneratedEventTimestamp" }
+  maxEvents:   100
+  firstRun:    1           # Run number to use for this file
+  firstEvent:  1           # number of first event in the file
+}
+
+# Define and configure some modules to do work on each event.
+# First modules are defined; they are scheduled later.
+# Modules are grouped by type.
+physics:
+{
+
+ producers:
+ {
+   generator: @local::pdvd_1GeV_muon
+ }
+
+
+ #define the producer and filter modules for this path, order matters,
+simulate: [ generator ]
+
+ #define the output stream, there could be more than one if using filters
+ stream1:  [ out1 ]
+
+ #trigger_paths is a keyword and contains the paths that modify the art::event,
+ #ie filters and producers
+ trigger_paths: [simulate]
+
+ #end_paths is a keyword and contains the paths that do not modify the art::Event,
+ #ie analyzers and output streams.  these all run simultaneously
+ end_paths:     [stream1]
+}
+
+#block to define where the output goes.  if you defined a filter in the physics
+#block and put it in the trigger_paths then you need to put a SelectEvents: {SelectEvents: [XXX]}
+#entry in the output stream you want those to go to, where XXX is the label of the filter module(s)
+outputs:
+{
+ out1:
+ {
+   module_type: RootOutput
+   fileName: "gensingle_protoDUNE.root" #default file name, can override from command line with -o or --output
+   dataTier: "generated"
+   compressionLevel: 1
+ }
+}
+
+services.TFileService.fileName: "gen_protodunevd_muon_1GeV_hist.root"
+source.maxEvents: 1
+outputs.out1.fileName: "gen_protodunevd_muon_1GeV.root"
+

fcl/protodunevd/gen/gen_protodunevd_singlep.fcl

@@ -13,11 +13,12 @@ pdvd_1GeV_electron:
  PDist:                 "Gaussian"                                 
 
  X0:                    [ 94.8 ]                                           
- Y0:                    [ -142.6 ]    
- Z0:                    [ 299.3 ]                                                               
+ Y0:                    [ 142.6 ]    
+ Z0:                    [ 0.7 ]                                                               
  T0:                    [ 0.0 ]     
- Theta0XZ:              [ -169.175 ]                                         
- Theta0YZ:              [ 44.486 ]                                          
+ Theta0XZ:              [ 169.175 ]                                         
+ Theta0YZ:              [ -135.514 ]                                          
+# Theta0YZ:              [ 44.486 ]                                          
 
  SigmaX:                [ 0.0 ]     
  SigmaY:                [ 0.0 ]                                 
@@ -38,5 +39,8 @@ pdvd_1GeV_kaon.PDG: [321]
 pdvd_1GeV_pion: @local::pdvd_1GeV_electron
 pdvd_1GeV_pion.PDG: [211]
 
+pdvd_1GeV_muon: @local::pdvd_1GeV_electron
+pdvd_1GeV_muon.PDG: [13]
+
 
 END_PROLOG

fcl/protodunevd/reco/protodunevd_reco.fcl

@@ -123,13 +123,14 @@ outputs:
 
 physics.producers.wclsdatavd.wcls_main.params.use_magnify:  "false"
 
-physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 5.0
-physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 5.0
-physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 5.0
+physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 2.0
+physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 2.0
+physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 2.0
 
 physics.producers.gaushit.CalDataModuleLabel: "wclsdatavd:gauss"
 physics.producers.emtrkmichelid.WireLabel: "wclsdatavd:gauss"
 
+physics.producers.pandora.ConfigFile:     "PandoraSettings_Master_ProtoDUNE_VD.xml"
 physics.producers.pandora.HitFinderModuleLabel:             "hitpdune"
 physics.producers.pandora.GeantModuleLabel:                 "tpcrawdecoder:simpleSC"