Skip to content

Commit

Permalink
changes for pbpb split reco workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@aphecetche
aphecetche committed Oct 23, 2023
1 parent f33b30c commit 7f47caf
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Detectors/Calibration/testMacros/getRunParameters.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ int main(int argc, char* argv[])
long duration = 0;
// duration as O2end - O2start:
auto& ccdb_inst = o2::ccdb::BasicCCDBManager::instance();
ccdb_inst.setURL("https://alice-ccdb.cern.ch");
ccdb_inst.setURL("http://alice-ccdb.cern.ch");
std::pair<uint64_t, uint64_t> run_times = ccdb_inst.getRunDuration(run);
long run_O2duration = long(run_times.second - run_times.first);
// access SOR and EOR timestamps
Expand Down
2 changes: 1 addition & 1 deletion Detectors/GlobalTrackingWorkflow/helpers/src/InputHelper.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ int InputHelper::addInputSpecs(const ConfigContext& configcontext, WorkflowSpec&
}

if (maskClusters[GID::MCH]) {
specs.emplace_back(o2::mch::getClusterReaderSpec(maskClustersMC[GID::MCH], "mch-global-cluster-reader", true, false));
specs.emplace_back(o2::mch::getClusterReaderSpec(maskClustersMC[GID::MCH], "mch-cluster-reader", true, false));
}

return 0;
Expand Down
6 changes: 5 additions & 1 deletion Detectors/MUON/MCH/IO/src/digits-reader-workflow.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cc)
{
bool useMC = !cc.options().get<bool>("disable-mc");

auto name = fmt::format("mch-digit-reader-{}-{}",
cc.options().get<std::string>("mch-output-digits-data-description"),
cc.options().get<std::string>("mch-output-digitrofs-data-description"));

WorkflowSpec specs;
specs.emplace_back(o2::mch::getDigitReaderSpec(
useMC,
"mch-digit-reader",
name,
cc.options().get<std::string>("mch-output-digits-data-description"),
cc.options().get<std::string>("mch-output-digitrofs-data-description")));

Expand Down
6 changes: 5 additions & 1 deletion Detectors/MUON/MCH/IO/src/digits-writer-workflow.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
WorkflowSpec defineDataProcessing(const ConfigContext& cc)
{
bool useMC = cc.options().get<bool>("enable-mc");
auto name = fmt::format("mch-digit-writer-{}-{}",
cc.options().get<std::string>("input-digits-data-description"),
cc.options().get<std::string>("input-digits-data-description"));

return WorkflowSpec{o2::mch::getDigitWriterSpec(
useMC,
"mch-digit-writer",
name,
cc.options().get<std::string>("mch-digit-outfile"),
cc.options().get<std::string>("input-digits-data-description"),
cc.options().get<std::string>("input-digitrofs-data-description"))};
Expand Down
4 changes: 3 additions & 1 deletion Detectors/TRD/workflow/src/trd-tracking-workflow.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
{"enable-qc", VariantType::Bool, false, {"enable tracking QC"}},
{"enable-pid", VariantType::Bool, false, {"Enable PID"}},
{"enable-ph", VariantType::Bool, false, {"Enable creation of PH plots"}},
{"trd-digits-spec", VariantType::Int, 0, {"Input digits subspec, ignored if disable-root-input is false"}},
{"track-sources", VariantType::String, std::string{GTrackID::ALL}, {"comma-separated list of sources to use for tracking"}},
{"filter-trigrec", VariantType::Bool, false, {"ignore interaction records without ITS data"}},
{"strict-matching", VariantType::Bool, false, {"High purity preliminary matching"}},
Expand Down Expand Up @@ -83,6 +84,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
auto vdexb = configcontext.options().get<bool>("enable-vdexb-calib");
auto gain = configcontext.options().get<bool>("enable-gain-calib");
auto pulseHeight = configcontext.options().get<bool>("enable-ph");
auto digitsSpec = configcontext.options().get<int>("trd-digits-spec");
bool rootInput = !configcontext.options().get<bool>("disable-root-input");
GTrackID::mask_t srcTRD = allowedSources & GTrackID::getSourcesMask(configcontext.options().get<std::string>("track-sources"));
if (strict && (srcTRD & ~GTrackID::getSourcesMask("TPC")).any()) {
Expand Down Expand Up @@ -120,7 +122,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
if (rootInput) {
specs.emplace_back(o2::trd::getTRDDigitReaderSpec(useMC));
}
specs.emplace_back(o2::framework::getTRDPulseHeightSpec(srcTRD, rootInput));
specs.emplace_back(o2::framework::getTRDPulseHeightSpec(srcTRD, rootInput ? 1 : digitsSpec));
}

// output devices
Expand Down
5 changes: 4 additions & 1 deletion prodtests/full-system-test/dpl-workflow.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,11 @@ if [[ ! -z ${WORKFLOW_DETECTORS_USE_GLOBAL_READER} ]]; then
has_detector FV0 && has_detector_from_global_reader FV0 && add_W o2-fv0-digit-reader-workflow "$DISABLE_MC --hbfutils-config o2_tfidinfo.root --fv0-digit-infile o2_fv0digits.root"
has_detector MID && has_detector_from_global_reader MID && add_W o2-mid-digits-reader-workflow "$DISABLE_MC --hbfutils-config o2_tfidinfo.root --mid-digit-infile mid-digits-decoded.root"
has_detector MCH && has_detector_from_global_reader MCH && add_W o2-mch-digits-reader-workflow "$DISABLE_MC --hbfutils-config o2_tfidinfo.root --infile mchdigits.root"
has_detector MCH && has_detector_from_global_reader MCH && add_W o2-mch-digits-reader-workflow "$DISABLE_MC --hbfutils-config o2_tfidinfo.root --infile mchfdigits.root --mch-output-digits-data-description F-DIGITS --mch-output-digitrofs-data-description TC-F-DIGITROFS"
has_detector MCH && has_detector_from_global_reader MCH && add_W o2-mch-errors-reader-workflow "--hbfutils-config o2_tfidinfo.root" "" 0
has_detector MCH && has_detector_from_global_reader MCH && add_W o2-mch-clusters-reader-workflow "--hbfutils-config o2_tfidinfo.root" "" 0
has_detector MCH && has_detector_from_global_reader MCH && add_W o2-mch-preclusters-reader-workflow "--hbfutils-config o2_tfidinfo.root" "" 0
has_detector TRD && has_detector_from_global_reader TRD && add_W o2-trd-digit-reader-workflow "--hbfutils-config o2_tfidinfo.root"
has_detector TRD && has_detector_from_global_reader TRD && add_W o2-trd-digit-reader-workflow "--hbfutils-config o2_tfidinfo.root" && TRD_CONFIG+=" --trd-digits-spec 1 "
has_detector TOF && has_detector_from_global_reader TOF && add_W o2-tof-reco-workflow "$DISABLE_MC --input-type digits --output-type NONE --hbfutils-config o2_tfidinfo.root"
fi

Expand Down Expand Up @@ -502,6 +504,7 @@ has_detector_reco PHS && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output
has_detector_reco FV0 && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-fv0-digits-writer-workflow ) && ! has_detector_from_global_reader FV0 && add_W o2-fv0-digits-writer-workflow "$DISABLE_MC"
has_detector_reco MID && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-mid-decoded-digits-writer-workflow ) && ! has_detector_from_global_reader MID && add_W o2-mid-decoded-digits-writer-workflow "--mid-digits-tree-name o2sim" "" 0
has_detector_reco MCH && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-mch-digits-writer-workflow ) && ! has_detector_from_global_reader MCH && add_W o2-mch-digits-writer-workflow "" "" 0
has_detector_reco MCH && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-mch-digits-writer-workflow ) && ! has_detector_from_global_reader MCH && add_W o2-mch-digits-writer-workflow "--input-digits-data-description F-DIGITS --input-digitrofs-data-description TC-F-DIGITROFS --mch-digit-outfile mchfdigits.root" "" 0
has_detector_reco MCH && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-mch-clusters-writer-workflow ) && ! has_detector_from_global_reader MCH && add_W o2-mch-clusters-writer-workflow "" "" 0
has_detector_reco MCH && ( [[ -z "$DISABLE_ROOT_OUTPUT" ]] || needs_root_output o2-mch-preclusters-writer-workflow ) && ! has_detector_from_global_reader MCH && add_W o2-mch-preclusters-writer-workflow "" "" 0

Expand Down

0 comments on commit 7f47caf

Please sign in to comment.