From 5d9e0f08a8c81c7674d084a8655136ac5b8ebcfa Mon Sep 17 00:00:00 2001 From: shahoian Date: Thu, 24 Jun 2021 16:31:53 +0200 Subject: [PATCH] Fixes --- .../src/TOFMatcherSpec.cxx | 16 ++++++++-------- .../TOF/workflowIO/src/TOFMatchedReaderSpec.cxx | 2 +- .../TOF/workflowIO/src/TOFMatchedWriterSpec.cxx | 4 ++-- prodtests/full-system-test/dpl-workflow.sh | 4 ++++ prodtests/sim_challenge.sh | 17 +++++++++++------ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Detectors/GlobalTrackingWorkflow/src/TOFMatcherSpec.cxx b/Detectors/GlobalTrackingWorkflow/src/TOFMatcherSpec.cxx index 9e184e50b37b1..8f67c904566a3 100644 --- a/Detectors/GlobalTrackingWorkflow/src/TOFMatcherSpec.cxx +++ b/Detectors/GlobalTrackingWorkflow/src/TOFMatcherSpec.cxx @@ -118,9 +118,9 @@ void TOFMatcherSpec::run(ProcessingContext& pc) mMatcher.run(recoData); if (isTPCused) { - pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MATCHINFO_0", 0, Lifetime::Timeframe}, mMatcher.getMatchedTrackVector(o2::dataformats::MatchInfoTOFReco::TrackType::TPC)); + pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MATCHINFOS_TPC", 0, Lifetime::Timeframe}, mMatcher.getMatchedTrackVector(o2::dataformats::MatchInfoTOFReco::TrackType::TPC)); if (mUseMC) { - pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHINFO_0", 0, Lifetime::Timeframe}, mMatcher.getMatchedTOFLabelsVector(o2::dataformats::MatchInfoTOFReco::TrackType::TPC)); + pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHINFOS_TPC", 0, Lifetime::Timeframe}, mMatcher.getMatchedTOFLabelsVector(o2::dataformats::MatchInfoTOFReco::TrackType::TPC)); } auto nmatch = mMatcher.getMatchedTrackVector(o2::dataformats::MatchInfoTOFReco::TrackType::TPC).size(); @@ -134,9 +134,9 @@ void TOFMatcherSpec::run(ProcessingContext& pc) } if (isITSTPCused) { - pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MATCHINFO_1", 0, Lifetime::Timeframe}, mMatcher.getMatchedTrackVector(o2::dataformats::MatchInfoTOFReco::TrackType::ITSTPC)); + pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MATCHINFOS", 0, Lifetime::Timeframe}, mMatcher.getMatchedTrackVector(o2::dataformats::MatchInfoTOFReco::TrackType::ITSTPC)); if (mUseMC) { - pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHINFO_1", 0, Lifetime::Timeframe}, mMatcher.getMatchedTOFLabelsVector(o2::dataformats::MatchInfoTOFReco::TrackType::ITSTPC)); + pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHINFOS", 0, Lifetime::Timeframe}, mMatcher.getMatchedTOFLabelsVector(o2::dataformats::MatchInfoTOFReco::TrackType::ITSTPC)); } } @@ -162,13 +162,13 @@ DataProcessorSpec getTOFMatcherSpec(GTrackID::mask_t src, bool useMC, bool useFI std::vector outputs; - outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFO_0", 0, Lifetime::Timeframe); - outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFO_1", 0, Lifetime::Timeframe); + outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFOS_TPC", 0, Lifetime::Timeframe); + outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFOS", 0, Lifetime::Timeframe); outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFO_2", 0, Lifetime::Timeframe); outputs.emplace_back(o2::header::gDataOriginTOF, "MATCHINFO_3", 0, Lifetime::Timeframe); if (useMC) { - outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFO_0", 0, Lifetime::Timeframe); - outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFO_1", 0, Lifetime::Timeframe); + outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFOS_TPC", 0, Lifetime::Timeframe); + outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFOS", 0, Lifetime::Timeframe); outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFO_2", 0, Lifetime::Timeframe); outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHINFO_3", 0, Lifetime::Timeframe); } diff --git a/Detectors/TOF/workflowIO/src/TOFMatchedReaderSpec.cxx b/Detectors/TOF/workflowIO/src/TOFMatchedReaderSpec.cxx index 06b76f470eb87..07426540392a9 100644 --- a/Detectors/TOF/workflowIO/src/TOFMatchedReaderSpec.cxx +++ b/Detectors/TOF/workflowIO/src/TOFMatchedReaderSpec.cxx @@ -104,7 +104,7 @@ DataProcessorSpec getTOFMatchedReaderSpec(bool useMC, bool tpcmatch, bool readTr outputs, AlgorithmSpec{adaptFromTask(useMC, tpcmatch, readTracks)}, Options{ - {"tof-matched-infile", VariantType::String, tpcmatch ? "o2match_toftpc.root" : "o2match_tof.root", {"Name of the input file"}}, + {"tof-matched-infile", VariantType::String, tpcmatch ? "o2match_tof_tpc.root" : "o2match_tof_itstpc.root", {"Name of the input file"}}, {"input-dir", VariantType::String, "none", {"Input directory"}}, {"treename", VariantType::String, "matchTOF", {"Name of top-level TTree"}}, }}; diff --git a/Detectors/TOF/workflowIO/src/TOFMatchedWriterSpec.cxx b/Detectors/TOF/workflowIO/src/TOFMatchedWriterSpec.cxx index bed6689f8a060..ca488913b32ae 100644 --- a/Detectors/TOF/workflowIO/src/TOFMatchedWriterSpec.cxx +++ b/Detectors/TOF/workflowIO/src/TOFMatchedWriterSpec.cxx @@ -47,8 +47,8 @@ DataProcessorSpec getTOFMatchedWriterSpec(bool useMC, const char* outdef, bool w auto loggerTofLabels = [](LabelsType const& labeltof) { LOG(INFO) << "TOF LABELS GOT " << labeltof.size() << " LABELS "; }; - o2::header::DataDescription ddMatchInfo{"MATCHINFO_1"}, ddMatchInfo_tpc{"MATCHINFO_0"}, - ddMCMatchTOF{"MCMATCHINFO_1"}, ddMCMatchTOF_tpc{"MCMATCHINFO_0"}; + o2::header::DataDescription ddMatchInfo{"MATCHINFOS"}, ddMatchInfo_tpc{"MATCHINFOS_TPC"}, + ddMCMatchTOF{"MCMATCHINFOS"}, ddMCMatchTOF_tpc{"MCMATCHINFOS_TPC"}; return MakeRootTreeWriterSpec(writeTOFTPC ? "TOFMatchedWriter_TPC" : "TOFMatchedWriter", outdef, diff --git a/prodtests/full-system-test/dpl-workflow.sh b/prodtests/full-system-test/dpl-workflow.sh index 35fa4ea7d100d..07a6a1d4a2efd 100755 --- a/prodtests/full-system-test/dpl-workflow.sh +++ b/prodtests/full-system-test/dpl-workflow.sh @@ -128,6 +128,8 @@ WORKFLOW+="o2-trd-global-tracking $ARGS_ALL --disable-root-input --disable-root- # Workflows disabled in sync mode if [ $SYNCMODE == 0 ]; then + WORKFLOW+="o2-tof-matcher-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --track-sources \"TPC,ITS-TPC\" | " + WORKFLOW+="o2-tof-matcher-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC | " WORKFLOW+="o2-mid-reco-workflow $ARGS_ALL --disable-root-output $DISABLE_MC | " WORKFLOW+="o2-mft-reco-workflow $ARGS_ALL --clusters-from-upstream $DISABLE_MC --disable-root-output | " @@ -139,6 +141,8 @@ fi # Workflows disabled in async mode if [ $CTFINPUT == 0 ]; then + WORKFLOW+="o2-tof-matcher-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --track-sources \"ITS-TPC\" | " + WORKFLOW+="o2-phos-reco-workflow $ARGS_ALL --input-type raw --output-type cells --disable-root-input --disable-root-output $DISABLE_MC | " WORKFLOW+="o2-cpv-reco-workflow $ARGS_ALL --input-type raw --output-type clusters --disable-root-input --disable-root-output $DISABLE_MC | " WORKFLOW+="o2-emcal-reco-workflow $ARGS_ALL --input-type raw --output-type cells --disable-root-output $DISABLE_MC --pipeline EMCALRawToCellConverterSpec:$N_EMC | " diff --git a/prodtests/sim_challenge.sh b/prodtests/sim_challenge.sh index 13849eb779fc4..4e0c9755514cc 100755 --- a/prodtests/sim_challenge.sh +++ b/prodtests/sim_challenge.sh @@ -159,12 +159,7 @@ if [ "$doreco" == "1" ]; then echo "Running TOF reco flow to produce clusters" #needs results of TOF digitized data and results of o2-tpcits-match-workflow taskwrapper tofReco.log o2-tof-reco-workflow $gloOpt - echo "Return status of its-tpc-tof match: $?" - - echo "Running primary vertex finding flow" - #needs results of TPC-ITS matching and FIT workflows - taskwrapper pvfinder.log o2-primary-vertexing-workflow $gloOpt - echo "Return status of primary vertexing: $?" + echo "Return status of tof cluster reco : $?" echo "Running Track-TOF macthing flow" #needs results of TOF clusters data from o2-tof-reco-workflow and results of o2-tpc-reco-workflow and ITS-TPC matching @@ -176,6 +171,16 @@ if [ "$doreco" == "1" ]; then taskwrapper tofmatch_qa.log root -b -q -l $O2_ROOT/share/macro/checkTOFMatching.C echo "Return status of TOF matching qa: $?" + echo "Running primary vertex finding flow" + #needs results of TPC-ITS matching and FIT workflows + taskwrapper pvfinder.log o2-primary-vertexing-workflow $gloOpt + echo "Return status of primary vertexing: $?" + + echo "Running secondary vertex finding flow" + #needs results of all trackers + P.Vertexer + taskwrapper svfinder.log o2-secondary-vertexing-workflow $gloOpt + echo "Return status of secondary vertexing: $?" + echo "Running ZDC reconstruction" #need ZDC digits taskwrapper zdcreco.log o2-zdc-digits-reco $gloOpt