Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Detectors/FIT/FDD/workflow/src/ReconstructorSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ namespace fdd

void FDDReconstructorDPL::init(InitContext& ic)
{

}

void FDDReconstructorDPL::run(ProcessingContext& pc)
Expand Down Expand Up @@ -79,7 +78,7 @@ DataProcessorSpec getFDDReconstructorSpec(bool useMC, bool useDeadChannelMap)
std::vector<OutputSpec> outputSpec;
inputSpec.emplace_back("digitsBC", o2::header::gDataOriginFDD, "DIGITSBC", 0, Lifetime::Timeframe);
inputSpec.emplace_back("digitsCh", o2::header::gDataOriginFDD, "DIGITSCH", 0, Lifetime::Timeframe);

if (useMC) {
LOG(info) << "Currently FDDReconstructor does not consume and provide MC truth";
// inputSpec.emplace_back("labels", o2::header::gDataOriginFDD, "DIGITSMCTR", 0, Lifetime::Timeframe);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class CollisionTimeRecoTask
LOG(info) << "Init for slewing calib object";
mCalibSlew = calibSlew->makeSlewingPlots();
};
void SetDeadChannelMap(const o2::fit::DeadChannelMap * deadChannelMap)
void SetDeadChannelMap(const o2::fit::DeadChannelMap* deadChannelMap)
{
LOG(info) << "Updated dead channel map for CollisionTimeRecoTask";
mDeadChannelMap = deadChannelMap;
mDeadChannelMap = deadChannelMap;
}
float getTimeInPS(const o2::ft0::ChannelData& channelData);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RP CollisionTimeRecoTask::processDigit(const o2::ft0::Digit& digit,
// Reference channels shouldn't participate in reco at all!
continue;
}
if(mDeadChannelMap && !mDeadChannelMap->isChannelAlive(channelData.ChId)) {
if (mDeadChannelMap && !mDeadChannelMap->isChannelAlive(channelData.ChId)) {
LOG(debug) << "Channel " << channelData.ChId << " is dead - discarding data";
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions Detectors/FIT/FT0/workflow/src/ReconstructionSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void ReconstructionDPL::finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
}
if (matcher == ConcreteDataMatcher("FT0", "DeadChannelMap", 0)) {
LOG(debug) << "New DeadChannelMap is uploaded";
mUpdateDeadChannelMap = false;
mUpdateDeadChannelMap = false;
return;
}
}
Expand All @@ -117,7 +117,7 @@ DataProcessorSpec getReconstructionSpec(bool useMC, const std::string ccdbpath,
std::vector<OutputSpec> outputSpec;
inputSpec.emplace_back("digits", o2::header::gDataOriginFT0, "DIGITSBC", 0, Lifetime::Timeframe);
inputSpec.emplace_back("digch", o2::header::gDataOriginFT0, "DIGITSCH", 0, Lifetime::Timeframe);

if (useMC) {
LOG(info) << "Currently Reconstruction does not consume and provide MC truth";
inputSpec.emplace_back("labels", o2::header::gDataOriginFT0, "DIGITSMCTR", 0, Lifetime::Timeframe);
Expand Down
3 changes: 1 addition & 2 deletions Detectors/FIT/FT0/workflow/src/ft0-reco-workflow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
{"disable-time-offset-calib", o2::framework::VariantType::Bool, false, {"disable timeoffset calibration"}},
{"disable-slewing-calib", o2::framework::VariantType::Bool, false, {"disable slewing calibration"}},
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}},
{"disable-dead-channel-map", VariantType::Bool, false, {"disable dead channel map"}}
};
{"disable-dead-channel-map", VariantType::Bool, false, {"disable dead channel map"}}};
o2::raw::HBFUtilsInitializer::addConfigOption(options);
std::swap(workflowOptions, options);
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/FV0/workflow/src/ReconstructionSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ DataProcessorSpec getReconstructionSpec(bool useMC, bool useDeadChannelMap, cons
LOG(info) << "Currently Reconstruction does not consume and provide MC truth";
inputSpec.emplace_back("labels", o2::header::gDataOriginFV0, "DIGITSMCTR", 0, Lifetime::Timeframe);
}
if(useDeadChannelMap) {
if (useDeadChannelMap) {
LOG(info) << "Dead channel map will be applied during reconstruction";
inputSpec.emplace_back("deadChannelMap", o2::header::gDataOriginFV0, "DeadChannelMap", 0, Lifetime::Condition, ccdbParamSpec("FV0/Calib/DeadChannelMap"));
}
Expand Down