Skip to content

Commit e033da3

Browse files
ktfktf
committed
Fix a few more Output with Lifetime::Timeframe
1 parent 0b19778 commit e033da3

9 files changed

Lines changed: 26 additions & 27 deletions

File tree

‎DataFormats/common/include/CommonDataFormat/FlatHisto1D.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace dataformats
3434
Fast 1D histo class which can be messages as
3535
FlatHisto1D<float> histo(nbins, xmin, xmax);
3636
histo.fill(...);
37-
pc.outputs().snapshot(Output{"Origin", "Desc", 0, Lifetime::Timeframe}, histo.getBase());
37+
pc.outputs().snapshot(Output{"Origin", "Desc", 0}, histo.getBase());
3838
3939
and received (read only!) as
4040
const auto hdata = pc.inputs().get<gsl::span<float>>("histodata");

‎DataFormats/common/include/CommonDataFormat/FlatHisto2D.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace dataformats
3535
Fast 2D histo class which can be messages as
3636
FlatHisto2D<float> histo(nbinsX, xmin, xmax, nbinsY, ymin, ymax);
3737
histo.fill(...);
38-
pc.outputs().snapshot(Output{"Origin", "Desc", 0, Lifetime::Timeframe}, histo.getBase());
38+
pc.outputs().snapshot(Output{"Origin", "Desc", 0}, histo.getBase());
3939
4040
and received (read only!) as
4141
const auto hdata = pc.inputs().get<gsl::span<float>>("histodata");

‎Detectors/FIT/FT0/workflow/include/FT0Workflow/RawReaderFT0.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ class RawReaderFT0 : public RawReaderFT0BaseNorm
8080
}
8181
void makeSnapshot(o2::framework::ProcessingContext& pc)
8282
{
83-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe}, mVecDigits);
84-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe}, mVecChannelData);
83+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
84+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
8585
if constexpr (sUseTrgInput) {
86-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0, o2::framework::Lifetime::Timeframe}, mVecTriggerInput);
86+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0}, mVecTriggerInput);
8787
}
8888
}
8989
bool mDumpData;
@@ -136,11 +136,11 @@ class RawReaderFT0ext : public RawReaderFT0BaseExt
136136
}
137137
void makeSnapshot(o2::framework::ProcessingContext& pc)
138138
{
139-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe}, mVecDigits);
140-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe}, mVecChannelData);
141-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSTRGEXT", 0, o2::framework::Lifetime::Timeframe}, mVecTrgExt);
139+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
140+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
141+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSTRGEXT", 0}, mVecTrgExt);
142142
if constexpr (sUseTrgInput) {
143-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0, o2::framework::Lifetime::Timeframe}, mVecTriggerInput);
143+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0}, mVecTriggerInput);
144144
}
145145
}
146146
bool mDumpData;
@@ -153,4 +153,4 @@ class RawReaderFT0ext : public RawReaderFT0BaseExt
153153
} // namespace ft0
154154
} // namespace o2
155155

156-
#endif
156+
#endif

‎Detectors/FIT/FT0/workflow/src/FT0DataDecoderDPLSpec.cxx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ namespace ft0
2828
void FT0DataDecoderDPLSpec::run(ProcessingContext& pc)
2929
{
3030
auto t1 = std::chrono::high_resolution_clock::now();
31-
3231
auto dummyOutput = [&pc, this]() {
3332
this->mVecDigits.resize(0);
34-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe}, mVecDigits);
33+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
3534
this->mVecChannelData.resize(0);
36-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe}, mVecChannelData);
35+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
3736
};
3837

3938
// if we see requested data type input with 0xDEADBEEF subspec and 0 payload this means that the "delayed message"
@@ -529,8 +528,8 @@ void FT0DataDecoderDPLSpec::run(ProcessingContext& pc)
529528
// Due to empty Digit container this dummy object will never participate in any further tasks.
530529
mVecChannelData.emplace_back();
531530
}
532-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe}, mVecDigits);
533-
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe}, mVecChannelData);
531+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
532+
pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
534533
auto t2 = std::chrono::high_resolution_clock::now();
535534
auto delay = std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1);
536535
LOG(debug) << "Decoder delay: " << delay.count();

‎Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ class TOFDPLRecoWorkflowTask
9797
// << " DIGITS TO " << mClustersArray.size() << " CLUSTERS";
9898

9999
// send matching-info
100-
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MTC_ITSTPC", 0, Lifetime::Timeframe}, mMatcher.getMatchedTrackVector());
100+
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MTC_ITSTPC", 0}, mMatcher.getMatchedTrackVector());
101101
if (mUseMC) {
102-
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHTOF", 0, Lifetime::Timeframe}, mMatcher.getMatchedTOFLabelsVector());
102+
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHTOF", 0}, mMatcher.getMatchedTOFLabelsVector());
103103
}
104-
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "CALIBDATA", 0, Lifetime::Timeframe}, mMatcher.getCalibVector());
104+
pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "CALIBDATA", 0}, mMatcher.getCalibVector());
105105
mTimer.Stop();
106106
}
107107

‎Detectors/GlobalTrackingWorkflow/tpcinterpolationworkflow/src/TPCResidualReaderSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ void TPCResidualReader::run(ProcessingContext& pc)
251251
mTrackResiduals.closeOutputFile(); // FIXME remove when map output is handled properly
252252

253253
// const auto& voxResArray = mTrackResiduals.getVoxelResults(); // array with one vector of results per sector
254-
// pc.outputs().snapshot(Output{"GLO", "VOXELRESULTS", 0, Lifetime::Timeframe}, voxResArray); // send results as one large vector?
254+
// pc.outputs().snapshot(Output{"GLO", "VOXELRESULTS", 0}, voxResArray); // send results as one large vector?
255255

256256
pc.services().get<ControlService>().endOfStream();
257257
pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);

‎Detectors/PHOS/calib/src/PHOSTurnonCalibDevice.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ void PHOSTurnonCalibDevice::endOfStream(o2::framework::EndOfStreamContext& ec)
8080
LOG(alarm) << "Incorrect fit results";
8181
}
8282
// //Send result to QC
83-
// ec.outputs().snapshot(o2::framework::Output{"PHS", "TRIGMAPDIFF", 0, o2::framework::Lifetime::Timeframe}, mTrigMapDiff);
84-
// ec.outputs().snapshot(o2::framework::Output{"PHS", "TURNONDIFF", 0, o2::framework::Lifetime::Timeframe}, mTurnOnDiff);
83+
// ec.outputs().snapshot(o2::framework::Output{"PHS", "TRIGMAPDIFF", 0}, mTrigMapDiff);
84+
// ec.outputs().snapshot(o2::framework::Output{"PHS", "TURNONDIFF", 0}, mTurnOnDiff);
8585
}
8686

8787
o2::framework::DataProcessorSpec o2::phos::getPHOSTurnonCalibDeviceSpec(bool useCCDB)

‎Detectors/TPC/workflow/src/LinkZSToDigitsSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ o2::framework::DataProcessorSpec getLinkZSToDigitsSpec(int channel, const std::s
109109
o2::tpc::TPCSectorHeader header{sector};
110110
header.activeSectors = processAttributes->activeSectors;
111111
// digit for now are transported per sector, not per lane
112-
// pc.outputs().snapshot(Output{"TPC", "DIGITS", static_cast<SubSpecificationType>(channel), Lifetime::Timeframe, header},
112+
// pc.outputs().snapshot(Output{"TPC", "DIGITS", static_cast<SubSpecificationType>(channel), header},
113113
pc.outputs().snapshot(Output{"TPC", "DIGITS", static_cast<SubSpecificationType>(sector), header},
114114
const_cast<std::vector<o2::tpc::Digit>&>(digits));
115115
};

‎Detectors/Upgrades/ITS3/workflow/src/ClusterReaderSpec.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ void ClusterReader::run(ProcessingContext& pc)
5353

5454
// This is a very ugly way of providing DataDescription, which anyway does not need to contain detector name.
5555
// To be fixed once the names-definition class is ready
56-
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSROF", 0, Lifetime::Timeframe}, mClusROFRec);
57-
pc.outputs().snapshot(Output{mOrigin, "COMPCLUSTERS", 0, Lifetime::Timeframe}, mClusterCompArray);
56+
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSROF", 0}, mClusROFRec);
57+
pc.outputs().snapshot(Output{mOrigin, "COMPCLUSTERS", 0}, mClusterCompArray);
5858
if (mUsePatterns) {
59-
pc.outputs().snapshot(Output{mOrigin, "PATTERNS", 0, Lifetime::Timeframe}, mPatternsArray);
59+
pc.outputs().snapshot(Output{mOrigin, "PATTERNS", 0}, mPatternsArray);
6060
}
6161
if (mUseMC) {
62-
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSMCTR", 0, Lifetime::Timeframe}, mClusterMCTruth);
63-
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSMC2ROF", 0, Lifetime::Timeframe}, mClusMC2ROFs);
62+
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSMCTR", 0}, mClusterMCTruth);
63+
pc.outputs().snapshot(Output{mOrigin, "CLUSTERSMC2ROF", 0}, mClusMC2ROFs);
6464
}
6565

6666
if (mTree->GetReadEntry() + 1 >= mTree->GetEntries()) {

0 commit comments

Comments
 (0)