Skip to content

Commit

Permalink
Merge branch 'release/v10_02_02d01'
Browse files Browse the repository at this point in the history
  • Loading branch information
aolivier23 committed Jan 10, 2025
2 parents 364fad7 + 713baeb commit ad81ff9
Show file tree
Hide file tree
Showing 6 changed files with 221 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 3.20 FATAL_ERROR)

find_package(cetmodules REQUIRED)
project(dunesw LANGUAGES CXX)
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.02.02d00)
set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.02.02d01)

include(CetCMakeEnv)
cet_cmake_env()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ services:
MemoryTracker: @local::dune_memory_tracker
RandomNumberGenerator: {} #ART native random number generator
FileCatalogMetadata: @local::art_file_catalog_mc
ExptGeoHelperInterface: @local::dune_geometry_helper
WireReadout: @local::dune_wire_readout
Geometry: @local::protodunehdv6_geo
}

physics.simulate: [tpcrawdecoder]
Expand Down
78 changes: 78 additions & 0 deletions fcl/protodunehd/gen/prod_207Bi_protodunehd.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#include "services_refactored_pdune.fcl"
#include "singles_dune.fcl"
#include "corsika_protodune.fcl"
#include "protodunehd_radiological_model_decay0.fcl"

process_name: SinglesGen

services:
{
# Load the service that manages root files for histograms.
TFileService: { fileName: "prod_cosmics_protodunehd_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::protodunehd_refactored_simulation_services
}

#Start each new event with an empty event.
source:
{
module_type: EmptyEvent
timestampPlugin: { plugin_type: "GeneratedEventTimestamp" }
maxEvents: 10
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:
{
cosmicgenerator: @local::protodune_corsika_cmc
ar39: @local::protodunehd_39Ar_in_LAr
kr85: @local::protodunehd_85Kr_in_LAr
ar42: @local::protodunehd_42Ar_in_LAr
k42fromar42: @local::protodunehd_42Kfrom42Ar_in_LAr
bi207source: @local::protodunehd_207Bi_source
}


#define the producer and filter modules for this path, order matters,
# simulate: [cosmicgenerator, ar39, ar42, kr85, k42fromar42,
#]
simulate: [ ar39, kr85, bi207source ]

#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: "prod_207bi_protodunehd.root" #default file name, can override from command line with -o or --output
dataTier: "generated"
compressionLevel: 1
}
}



98 changes: 98 additions & 0 deletions fcl/protodunevd/gen/gen_protodunevd_allradio.fcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
#include "services_refactored_pdune.fcl"
#include "singles_dune.fcl"
#include "corsika_protodune.fcl"
#include "CORSIKAGendp.fcl"
#include "protodunevd_radiological_model_decay0.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:
{
ar39: @local::protodunevd_39Ar_in_LAr
kr85: @local::protodunevd_85Kr_in_LAr
ar42: @local::protodunevd_42Ar_in_LAr
k42fromar42: @local::protodunevd_42Kfrom42Ar_in_LAr
k40cathode1: @local::protodunevd_40K_in_Cathode_nonTCOside
k40cathode2: @local::protodunevd_40K_in_Cathode_TCOside
k40anode0: @local::protodunevd_40K_in_Anode0
k40anode1: @local::protodunevd_40K_in_Anode1
k40anode2: @local::protodunevd_40K_in_Anode2
k40anode3: @local::protodunevd_40K_in_Anode3
th232cathode1: @local::protodunevd_232Th_chain_in_Cathode_nonTCOside
th232cathode2: @local::protodunevd_232Th_chain_in_Cathode_TCOside
th232anode0: @local::protodunevd_232Th_chain_in_Anode0
th232anode1: @local::protodunevd_232Th_chain_in_Anode1
th232anode2: @local::protodunevd_232Th_chain_in_Anode2
th232anode3: @local::protodunevd_232Th_chain_in_Anode3
u238cathode1: @local::protodunevd_238U_chain_in_Cathode_nonTCOside
u238cathode2: @local::protodunevd_238U_chain_in_Cathode_TCOside
u238anode0: @local::protodunevd_238U_chain_in_Anode0
u238anode1: @local::protodunevd_238U_chain_in_Anode1
u238anode2: @local::protodunevd_238U_chain_in_Anode2
u238anode3: @local::protodunevd_238U_chain_in_Anode3
}


#define the producer and filter modules for this path, order matters,
simulate: [ ar39, ar42, kr85, k42fromar42,
k40cathode1, k40cathode2, k40anode0, k40anode1, k40anode2, k40anode3,
th232cathode1, th232cathode2, th232anode0, th232anode1, th232anode2, th232anode3,
u238cathode1, u238cathode2, u238anode0, u238anode1, u238anode2, u238anode3
]

#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_radio_hist.root"
source.maxEvents: 1
outputs.out1.fileName: "gen_protodunevd_radio.root"
63 changes: 38 additions & 25 deletions fcl/protodunevd/reco/protodunevd_data_reco.fcl
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#include "HDF5RawInput3.fcl"
#include "PDHDTPCReader.fcl"
#include "PDHDDataInterfaceWIBEth3.fcl"
#include "PDHDTriggerReader3.fcl"
#include "PDHDTimingRawDecoder.fcl"
#include "PDVDTPCReader.fcl"
#include "DAPHNEReaderPDHD.fcl"

#include "wirecell_dune.fcl"
Expand Down Expand Up @@ -42,18 +39,14 @@ services:{
IFDH: {}
DetectorPropertiesService: @local::protodunevd_detproperties

PD2HDChannelMapService:
PDVDChannelMapService:
{
FileName: "PD2VDBottomTPCChannelMap_v1.txt"
}

#PD2HDChannelMapService:{
# FileName: "vdcbce_chanmap_v4.txt"
#}
#DAPHNEChannelMapService: {
# FileName: "DAPHNE_vd_coldbox_ChannelMap_bde2.txt"
# IgnoreLinks: true
#}
DAPHNEChannelMapService: {
FileName: "DAPHNE_vd_coldbox_ChannelMap_bde2.txt"
IgnoreLinks: true
}
#IPhotonCalibrator: {
# BadChannels: []
# service_provider: "PhotonCalibratorServiceProtoDUNESP"
Expand All @@ -80,9 +73,14 @@ physics: {
producers: {
rns: { module_type: "RandomNumberSaver" }
#Decoders
tpcrawdecoder: @local::PDHDTPCReaderDefaults
#pdhddaphne: @local::DAPHNEReaderPDHD
#PDS reco
tpcrawdecoder: @local::PDVDTPCReaderDefaults
pdhddaphne: @local::DAPHNEReaderPDHD
#PDS reco
ophit: @local::protodune_ophit_data_internal
opflash: @local::protodune_opflash_data_internal
opslicer: @local::protodune_opslicer

#CRP reco
wclsdatavd: @local::protodunevd_nfsp
gaushit: @local::dunevdfd_gaushitfinder
reco3d: @local::protodunespmc_spacepointsolver
Expand All @@ -100,8 +98,10 @@ physics: {
pandoraGnocalo: @local::pdune_vd_gnocchi_calodata

}
reco: [tpcrawdecoder,
rns,
reco: [rns,
tpcrawdecoder,
#pdhddaphne,
#ophit, opflash, opslicer,
wclsdatavd,
gaushit,
reco3d,
Expand All @@ -120,19 +120,32 @@ physics: {
end_paths : [ output ]
}

physics.producers.tpcrawdecoder.APAList: [ 10, 11 ]
physics.producers.tpcrawdecoder.DecoderToolParams: @local::PDHDDataInterfaceWIBEth3Defaults
#PDS raw data decoder settings
physics.producers.pdhddaphne.DAPHNEInterface: { tool_type: "DAPHNEInterface2" }

#PDS reconstruction settings
physics.producers.ophit.InputModule: "pdhddaphne"
physics.producers.ophit.InputLabels: [ "daq" ]
physics.producers.opflash.InputModule: "ophit"
physics.producers.opslicer.OpHitModuleLabel: "ophit"

#CRP raw data decoder settings
physics.producers.tpcrawdecoder.DecoderToolParams.DebugLevel: 0
physics.producers.tpcrawdecoder.DecoderToolParams.SubDetectorString: "VD_Bottom_TPC"
physics.producers.wclsdatavd.wcls_main.params.use_magnify: "false"

physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 2.0
physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 2.0
physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 2.0
#WireCell signal processing settings
physics.producers.wclsdatavd.wcls_main.params.use_magnify: "false"
physics.producers.wclsdatavd.wcls_main.params.raw_input_label: "tpcrawdecoder:daq"

#Hit finder settings
physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane0.RoiThreshold: 0.5
physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane1.RoiThreshold: 0.5
physics.producers.gaushit.HitFinderToolVec.CandidateHitsPlane2.RoiThreshold: 0.5
physics.producers.gaushit.CalDataModuleLabel: "wclsdatavd:gauss"

# CNN settings
physics.producers.emtrkmichelid.WireLabel: "wclsdatavd:gauss"

# Pandora settings
physics.producers.pandora.ConfigFile: "PandoraSettings_Master_ProtoDUNE_VD.xml"
physics.producers.pandora.HitFinderModuleLabel: "hitpdune"
physics.producers.pandora.GeantModuleLabel: "tpcrawdecoder:simpleSC"
Expand Down
8 changes: 4 additions & 4 deletions ups/product_deps
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ table_fragment_end

product version
cetmodules v3_24_01 - only_for_build
duneexamples v10_02_02d00
dunedataprep v10_02_02d00
duneana v10_02_02d00
protoduneana v10_02_02d00
duneexamples v10_02_02d01
dunedataprep v10_02_02d01
duneana v10_02_02d01
protoduneana v10_02_02d01
end_product_list


Expand Down

0 comments on commit ad81ff9

Please sign in to comment.