Skip to content

Small update for the converter #5002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgrosseo merged 4 commits into from
Dec 6, 2020
Merged

Small update for the converter #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b97d1f
Update: configurable TFNumber and collision time wrt to the beginning…
nburmaso Dec 4, 2020
985170b
Fix for collision time resolution
nburmaso Dec 4, 2020
45e2c54
Fix for collision time
nburmaso Dec 4, 2020
4b150ca
Fix missing declaration of mTFNumber
nburmaso Dec 4, 2020
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
1 change: 1 addition & 0 deletions Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class AODProducerWorkflowDPL : public Task
int mFillTracksITS = 1;
int mFillTracksTPC = 1;
int mFillTracksITSTPC = 1;
int mTFNumber = -1;
TStopwatch mTimer;

uint64_t maxGlBC = 0;
Expand Down
23 changes: 17 additions & 6 deletions Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ void AODProducerWorkflowDPL::init(InitContext& ic)
mFillTracksITS = ic.options().get<int>("fill-tracks-its");
mFillTracksTPC = ic.options().get<int>("fill-tracks-tpc");
mFillTracksITSTPC = ic.options().get<int>("fill-tracks-its-tpc");
mTFNumber = ic.options().get<int>("aod-timeframe-id");
if (mTFNumber == -1) {
LOG(INFO) << "TFNumber will be obtained from CCDB";
}
LOG(INFO) << "track filling flags set to: "
<< "\n ITS = " << mFillTracksITS << "\n TPC = " << mFillTracksTPC << "\n ITSTPC = " << mFillTracksITSTPC;

Expand Down Expand Up @@ -468,8 +472,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
auto& cov = vertex.getCov();
auto& timeStamp = vertex.getTimeStamp();
Double_t tsTimeStamp = timeStamp.getTimeStamp() * 1E3; // mus to ns
// FIXME:
// should use IRMin and IRMax for globalBC calculation
// TODO:
// use filling scheme to calculate most prob. BC
uint64_t globalBC = std::round(tsTimeStamp / o2::constants::lhc::LHCBunchSpacingNS);

LOG(DEBUG) << globalBC << " " << tsTimeStamp;
Expand All @@ -478,6 +482,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
firstVtxGlBC = globalBC;
}

// collision timestamp in ns wrt the beginning of collision BC
tsTimeStamp = globalBC * o2::constants::lhc::LHCBunchSpacingNS - tsTimeStamp;
int BCid = mGlobBC2BCID.at(globalBC);
// TODO:
// get real collision time mask
Expand All @@ -495,8 +501,8 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
cov[5],
vertex.getChi2(),
vertex.getNContributors(),
timeStamp.getTimeStamp(),
timeStamp.getTimeStampError(),
tsTimeStamp,
timeStamp.getTimeStampError() * 1E3,
collisionTimeMask);

auto trackRef = primVer2TRefs[collisionID];
Expand Down Expand Up @@ -610,7 +616,11 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
}
}

timeFrameNumberBuilder = getTFNumber(firstVtxGlBC, runNumber);
if (mTFNumber == -1) {
timeFrameNumberBuilder = getTFNumber(firstVtxGlBC, runNumber);
} else {
timeFrameNumberBuilder = mTFNumber;
}

mTimer.Stop();
}
Expand Down Expand Up @@ -663,7 +673,8 @@ DataProcessorSpec getAODProducerWorkflowSpec()
Options{
ConfigParamSpec{"fill-tracks-its", VariantType::Int, 1, {"Fill ITS tracks into tracks table"}},
ConfigParamSpec{"fill-tracks-tpc", VariantType::Int, 1, {"Fill TPC tracks into tracks table"}},
ConfigParamSpec{"fill-tracks-its-tpc", VariantType::Int, 1, {"Fill ITS-TPC tracks into tracks table"}}}};
ConfigParamSpec{"fill-tracks-its-tpc", VariantType::Int, 1, {"Fill ITS-TPC tracks into tracks table"}},
ConfigParamSpec{"aod-timeframe-id", VariantType::Int, -1, {"Set timeframe number"}}}};
}

} // namespace o2::aodproducer