diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 3d8afffe46..06392478cf 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -18,20 +18,6 @@ cet_build_plugin(ConditionsService art::service configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/conditions_01.txt ${CURRENT_BINARY_DIR} data/conditions_01.txt ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_dt_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_ep_vs_path_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_xs_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_dt_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_ep_vs_path_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_xs_v4_2_4.tab ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dedx.rtbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dt.tbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_ep_vs_path.tbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_xdrds.tbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dedx.rtbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dt.tbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_ep_vs_path.tbl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_xdrds.tbl ) install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/ConditionsService) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index ed1e2c08ef..09e0c0f1f5 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -22,6 +22,23 @@ cet_build_plugin(ParticleIDRead art::module configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_dt_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_ep_vs_path_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_xs_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_dt_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_ep_vs_path_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_xs_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dedx.rtbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dt.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_ep_vs_path.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_xdrds.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dedx.rtbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dt.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_ep_vs_path.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_xdrds.tbl ) + +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/ParticleID) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ParticleID/fcl) diff --git a/ConditionsService/data/pid_ele_dt_v4_2_4.tab b/ParticleID/data/pid_ele_dt_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_ele_dt_v4_2_4.tab rename to ParticleID/data/pid_ele_dt_v4_2_4.tab diff --git a/ConditionsService/data/pid_ele_ep_vs_path_v4_2_4.tab b/ParticleID/data/pid_ele_ep_vs_path_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_ele_ep_vs_path_v4_2_4.tab rename to ParticleID/data/pid_ele_ep_vs_path_v4_2_4.tab diff --git a/ConditionsService/data/pid_ele_xs_v4_2_4.tab b/ParticleID/data/pid_ele_xs_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_ele_xs_v4_2_4.tab rename to ParticleID/data/pid_ele_xs_v4_2_4.tab diff --git a/ConditionsService/data/pid_muo_dt_v4_2_4.tab b/ParticleID/data/pid_muo_dt_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_muo_dt_v4_2_4.tab rename to ParticleID/data/pid_muo_dt_v4_2_4.tab diff --git a/ConditionsService/data/pid_muo_ep_vs_path_v4_2_4.tab b/ParticleID/data/pid_muo_ep_vs_path_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_muo_ep_vs_path_v4_2_4.tab rename to ParticleID/data/pid_muo_ep_vs_path_v4_2_4.tab diff --git a/ConditionsService/data/pid_muo_xs_v4_2_4.tab b/ParticleID/data/pid_muo_xs_v4_2_4.tab similarity index 100% rename from ConditionsService/data/pid_muo_xs_v4_2_4.tab rename to ParticleID/data/pid_muo_xs_v4_2_4.tab diff --git a/ConditionsService/data/v5_7_0/pid_ele_dedx.rtbl b/ParticleID/data/v5_7_0/pid_ele_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_ele_dedx.rtbl rename to ParticleID/data/v5_7_0/pid_ele_dedx.rtbl diff --git a/ConditionsService/data/v5_7_0/pid_ele_dt.tbl b/ParticleID/data/v5_7_0/pid_ele_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_ele_dt.tbl rename to ParticleID/data/v5_7_0/pid_ele_dt.tbl diff --git a/ConditionsService/data/v5_7_0/pid_ele_ep_vs_path.tbl b/ParticleID/data/v5_7_0/pid_ele_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_ele_ep_vs_path.tbl rename to ParticleID/data/v5_7_0/pid_ele_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_0/pid_ele_xdrds.tbl b/ParticleID/data/v5_7_0/pid_ele_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_ele_xdrds.tbl rename to ParticleID/data/v5_7_0/pid_ele_xdrds.tbl diff --git a/ConditionsService/data/v5_7_0/pid_muo_dedx.rtbl b/ParticleID/data/v5_7_0/pid_muo_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_muo_dedx.rtbl rename to ParticleID/data/v5_7_0/pid_muo_dedx.rtbl diff --git a/ConditionsService/data/v5_7_0/pid_muo_dt.tbl b/ParticleID/data/v5_7_0/pid_muo_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_muo_dt.tbl rename to ParticleID/data/v5_7_0/pid_muo_dt.tbl diff --git a/ConditionsService/data/v5_7_0/pid_muo_ep_vs_path.tbl b/ParticleID/data/v5_7_0/pid_muo_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_muo_ep_vs_path.tbl rename to ParticleID/data/v5_7_0/pid_muo_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_0/pid_muo_xdrds.tbl b/ParticleID/data/v5_7_0/pid_muo_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_0/pid_muo_xdrds.tbl rename to ParticleID/data/v5_7_0/pid_muo_xdrds.tbl diff --git a/ConditionsService/data/v5_7_2/pid_ele_dedx.rtbl b/ParticleID/data/v5_7_2/pid_ele_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_ele_dedx.rtbl rename to ParticleID/data/v5_7_2/pid_ele_dedx.rtbl diff --git a/ConditionsService/data/v5_7_2/pid_ele_dt.tbl b/ParticleID/data/v5_7_2/pid_ele_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_ele_dt.tbl rename to ParticleID/data/v5_7_2/pid_ele_dt.tbl diff --git a/ConditionsService/data/v5_7_2/pid_ele_ep_vs_path.tbl b/ParticleID/data/v5_7_2/pid_ele_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_ele_ep_vs_path.tbl rename to ParticleID/data/v5_7_2/pid_ele_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_2/pid_ele_xdrds.tbl b/ParticleID/data/v5_7_2/pid_ele_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_ele_xdrds.tbl rename to ParticleID/data/v5_7_2/pid_ele_xdrds.tbl diff --git a/ConditionsService/data/v5_7_2/pid_muo_dedx.rtbl b/ParticleID/data/v5_7_2/pid_muo_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_muo_dedx.rtbl rename to ParticleID/data/v5_7_2/pid_muo_dedx.rtbl diff --git a/ConditionsService/data/v5_7_2/pid_muo_dt.tbl b/ParticleID/data/v5_7_2/pid_muo_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_muo_dt.tbl rename to ParticleID/data/v5_7_2/pid_muo_dt.tbl diff --git a/ConditionsService/data/v5_7_2/pid_muo_ep_vs_path.tbl b/ParticleID/data/v5_7_2/pid_muo_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_muo_ep_vs_path.tbl rename to ParticleID/data/v5_7_2/pid_muo_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_2/pid_muo_xdrds.tbl b/ParticleID/data/v5_7_2/pid_muo_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_2/pid_muo_xdrds.tbl rename to ParticleID/data/v5_7_2/pid_muo_xdrds.tbl diff --git a/ConditionsService/data/v5_7_9/pid_ele_dedx.rtbl b/ParticleID/data/v5_7_9/pid_ele_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_ele_dedx.rtbl rename to ParticleID/data/v5_7_9/pid_ele_dedx.rtbl diff --git a/ConditionsService/data/v5_7_9/pid_ele_dt.tbl b/ParticleID/data/v5_7_9/pid_ele_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_ele_dt.tbl rename to ParticleID/data/v5_7_9/pid_ele_dt.tbl diff --git a/ConditionsService/data/v5_7_9/pid_ele_ep_vs_path.tbl b/ParticleID/data/v5_7_9/pid_ele_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_ele_ep_vs_path.tbl rename to ParticleID/data/v5_7_9/pid_ele_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_9/pid_ele_xdrds.tbl b/ParticleID/data/v5_7_9/pid_ele_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_ele_xdrds.tbl rename to ParticleID/data/v5_7_9/pid_ele_xdrds.tbl diff --git a/ConditionsService/data/v5_7_9/pid_muo_dedx.rtbl b/ParticleID/data/v5_7_9/pid_muo_dedx.rtbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_muo_dedx.rtbl rename to ParticleID/data/v5_7_9/pid_muo_dedx.rtbl diff --git a/ConditionsService/data/v5_7_9/pid_muo_dt.tbl b/ParticleID/data/v5_7_9/pid_muo_dt.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_muo_dt.tbl rename to ParticleID/data/v5_7_9/pid_muo_dt.tbl diff --git a/ConditionsService/data/v5_7_9/pid_muo_ep_vs_path.tbl b/ParticleID/data/v5_7_9/pid_muo_ep_vs_path.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_muo_ep_vs_path.tbl rename to ParticleID/data/v5_7_9/pid_muo_ep_vs_path.tbl diff --git a/ConditionsService/data/v5_7_9/pid_muo_xdrds.tbl b/ParticleID/data/v5_7_9/pid_muo_xdrds.tbl similarity index 100% rename from ConditionsService/data/v5_7_9/pid_muo_xdrds.tbl rename to ParticleID/data/v5_7_9/pid_muo_xdrds.tbl diff --git a/ParticleID/fcl/prolog.fcl b/ParticleID/fcl/prolog.fcl index f788da0c02..1e62b80e9f 100644 --- a/ParticleID/fcl/prolog.fcl +++ b/ParticleID/fcl/prolog.fcl @@ -8,8 +8,8 @@ ParticleID: { ParticleID : { module_type : ParticleID fitterModuleLabel : MergePatRec - ElectronTemplates : "Offline/ConditionsService/data/v5_7_9/pid_ele_dedx.rtbl" - MuonTemplates : "Offline/ConditionsService/data/v5_7_9/pid_muo_dedx.rtbl" + ElectronTemplates : "Offline/ParticleID/data/v5_7_9/pid_ele_dedx.rtbl" + MuonTemplates : "Offline/ParticleID/data/v5_7_9/pid_muo_dedx.rtbl" fitparticle : 11 fitdirection : @local::FitDir.downstream debugLevel : 0