Skip to content

Commit 2a06eb5

Browse files
ktfalcaliva
authored andcommitted
Remove Lifetime specification from Output
The .lifetime field in Output is to be removed. This includes cases in which the value is not the default.
1 parent acdb0c6 commit 2a06eb5

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Detectors/GlobalTrackingWorkflow/src/GlobalFwdMatchingAssessmentSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void GlobalFwdAssessmentSpec::sendOutput(DataAllocator& output)
109109
TObjArray objar;
110110
mGloFwdAssessment->getHistos(objar);
111111

112-
output.snapshot(Output{"GLO", "FWDASSESSMENT", 0, Lifetime::Sporadic}, objar);
112+
output.snapshot(Output{"GLO", "FWDASSESSMENT", 0}, objar);
113113

114114
TFile* f = new TFile(Form("GlobalForwardAssessment.root"), "RECREATE");
115115
objar.Write();

Detectors/ITSMFT/MFT/workflow/src/MFTAssessmentSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void MFTAssessmentSpec::sendOutput(DataAllocator& output)
9090
TObjArray objar;
9191
mMFTAssessment->getHistos(objar);
9292

93-
output.snapshot(Output{"MFT", "MFTASSESSMENT", 0, Lifetime::Sporadic}, objar);
93+
output.snapshot(Output{"MFT", "MFTASSESSMENT", 0}, objar);
9494

9595
TFile* f = new TFile(Form("MFTAssessment.root"), "RECREATE");
9696
objar.Write();

Detectors/PHOS/calib/src/PHOSL1phaseCalibDevice.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void PHOSL1phaseCalibDevice::endOfStream(o2::framework::EndOfStreamContext& ec)
7171
ec.outputs().snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "PHOS_L1phase", 0}, info);
7272
// Send summary to QC
7373
LOG(info) << "Sending histos to QC ";
74-
ec.outputs().snapshot(o2::framework::Output{"PHS", "L1PHASEHISTO", 0, o2::framework::Lifetime::Sporadic}, mCalibrator->getQcHistos());
74+
ec.outputs().snapshot(o2::framework::Output{"PHS", "L1PHASEHISTO", 0}, mCalibrator->getQcHistos());
7575
}
7676

7777
o2::framework::DataProcessorSpec o2::phos::getPHOSL1phaseCalibDeviceSpec()

Detectors/PHOS/workflow/src/RawToCellConverterSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void RawToCellConverterSpec::run(framework::ProcessingContext& ctx)
115115
ctx.outputs().snapshot(o2::framework::Output{"PHS", "RAWHWERRORS", 0, o2::framework::Lifetime::Timeframe}, mOutputHWErrors);
116116
if (mFillChi2) {
117117
mOutputFitChi.clear();
118-
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CELLFITQA", 0, o2::framework::Lifetime::QA}, mOutputFitChi);
118+
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CELLFITQA", 0}, mOutputFitChi);
119119
}
120120
return; // empty TF, nothing to process
121121
}
@@ -294,7 +294,7 @@ void RawToCellConverterSpec::run(framework::ProcessingContext& ctx)
294294
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CELLTRIGREC", mflpId, o2::framework::Lifetime::Timeframe}, mOutputTriggerRecords);
295295
ctx.outputs().snapshot(o2::framework::Output{"PHS", "RAWHWERRORS", 0, o2::framework::Lifetime::Timeframe}, mOutputHWErrors);
296296
if (mFillChi2) {
297-
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CELLFITQA", 0, o2::framework::Lifetime::QA}, mOutputFitChi);
297+
ctx.outputs().snapshot(o2::framework::Output{"PHS", "CELLFITQA", 0}, mOutputFitChi);
298298
}
299299
}
300300

Detectors/TPC/workflow/include/TPCWorkflow/TPCDistributeSACSpec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class TPCDistributeSACSpec : public o2::framework::Task
102102
void sendOutput(o2::framework::ProcessingContext& pc)
103103
{
104104
LOGP(info, "Sending SACs on lane: {} for {} TFs", mCurrentOutLane, mProcessedTFs);
105-
pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0, Lifetime::Sporadic}, mCCDBTimeStamp);
105+
pc.outputs().snapshot(Output{gDataOriginTPC, getDataDescriptionSACCCDB(), 0}, mCCDBTimeStamp);
106106
for (unsigned int i = 0; i < o2::tpc::GEMSTACKS; ++i) {
107107
pc.outputs().snapshot(Output{gDataOriginTPC, mDataDescrOut[mCurrentOutLane], header::DataHeader::SubSpecificationType{i}}, mSACs[i]);
108108
}

Detectors/TPC/workflow/src/OccupancyFilterSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class OccupancyFilterDevice : public o2::framework::Task
106106
{
107107
o2::tpc::TPCSectorHeader header{sector};
108108
header.activeSectors = (0x1 << sector);
109-
output.snapshot(Output{gDataOriginTPC, "FILTERDIG", static_cast<SubSpecificationType>(sector), Lifetime::Sporadic, header}, digits);
109+
output.snapshot(Output{gDataOriginTPC, "FILTERDIG", static_cast<SubSpecificationType>(sector), header}, digits);
110110
}
111111
};
112112

Detectors/TPC/workflow/src/TPCVDriftTglCalibSpec.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ void TPCVDriftTglCalibSpec::sendOutput(DataAllocator& output)
104104
auto image = o2::ccdb::CcdbApi::createObjectImage(&payloadVec[i], &w);
105105
LOG(info) << "Sending object " << w.getPath() << "/" << w.getFileName() << " of size " << image->size()
106106
<< " bytes, valid for " << w.getStartValidityTimestamp() << " : " << w.getEndValidityTimestamp();
107-
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "TPCVDTGL", i, Lifetime::Sporadic}, *image.get()); // vector<char>
108-
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "TPCVDTGL", i, Lifetime::Sporadic}, w); // root-serialized
107+
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "TPCVDTGL", i}, *image.get()); // vector<char>
108+
output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "TPCVDTGL", i}, w); // root-serialized
109109
}
110110
if (payloadVec.size()) {
111111
mCalibrator->initOutput(); // reset the outputs once they are already sent

Detectors/ZDC/calib/src/BaselineCalibEPNSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void BaselineCalibEPNSpec::run(ProcessingContext& pc)
127127
}
128128
// Send intermediate calibration data
129129
auto& summary = mWorker.mData.getSummary();
130-
o2::framework::Output outputData("ZDC", "BASECALIBDATA", 0, Lifetime::Sporadic);
130+
o2::framework::Output outputData("ZDC", "BASECALIBDATA", 0);
131131
pc.outputs().snapshot(outputData, summary);
132132
if (pc.transitionState() == TransitionHandlingState::Requested) {
133133
// End of processing for this run

Detectors/ZDC/calib/src/NoiseCalibEPNSpec.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,19 @@ void NoiseCalibEPNSpec::run(ProcessingContext& pc)
113113
if (mVerbosity > DbgMedium && mModTF > 0) {
114114
LOG(info) << "Send intermediate calibration data mProcessed=" << mProcessed << " >= mModTF=" << mModTF;
115115
}
116-
o2::framework::Output outputData("ZDC", "NOISECALIBDATA", 0, Lifetime::Sporadic);
116+
o2::framework::Output outputData("ZDC", "NOISECALIBDATA", 0);
117117
pc.outputs().snapshot(outputData, summary);
118118
for (int ih = 0; ih < NChannels; ih++) {
119119
{
120-
o2::framework::Output output("ZDC", "NOISE_1DH", ih, Lifetime::Sporadic);
120+
o2::framework::Output output("ZDC", "NOISE_1DH", ih);
121121
pc.outputs().snapshot(output, mWorker.mH[0][ih]->getBase());
122122
}
123123
{
124-
o2::framework::Output output("ZDC", "NOISE_1DH_S", ih, Lifetime::Sporadic);
124+
o2::framework::Output output("ZDC", "NOISE_1DH_S", ih);
125125
pc.outputs().snapshot(output, mWorker.mH[1][ih]->getBase());
126126
}
127127
{
128-
o2::framework::Output output("ZDC", "NOISE_1DH_D", ih, Lifetime::Sporadic);
128+
o2::framework::Output output("ZDC", "NOISE_1DH_D", ih);
129129
pc.outputs().snapshot(output, mWorker.mH[2][ih]->getBase());
130130
}
131131
}

0 commit comments

Comments
 (0)