Skip to content

Option to not write json files in the ED workflow that are empty #8625

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
davidrohr merged 1 commit into from
Apr 21, 2022
Merged

Option to not write json files in the ED workflow that are empty #8625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ...tVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ class VisualisationEvent
float getMinTimeOfTracks() const { return this->mMinTimeOfTracks; }
float getMaxTimeOfTracks() const { return this->mMaxTimeOfTracks; } /// maximum time of tracks in the event

bool isEmpty() const { return getTrackCount() == 0 && getClusterCount() == 0; }

private:
float mMinTimeOfTracks; /// minimum time of tracks in the event
float mMaxTimeOfTracks; /// maximum time of tracks in the event
Expand Down
8 changes: 2 additions & 6 deletions EventVisualisation/Workflow/include/EveWorkflow/EveWorkflowHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,7 @@ class EveWorkflowHelper
void selectTracks(const CalibObjectsConst* calib, GID::mask_t maskCl,
GID::mask_t maskTrk, GID::mask_t maskMatch);
void addTrackToEvent(const o2::track::TrackParCov& tr, GID gid, float trackTime, float dz, GID::Source source = GID::NSources);
void draw(const std::string& jsonPath, int numberOfFiles, int numberOfTracks,
o2::dataformats::GlobalTrackID::mask_t trkMask,
o2::dataformats::GlobalTrackID::mask_t clMask,
o2::header::DataHeader::RunNumberType runNumber,
o2::framework::DataProcessingHeader::CreationTime creation,
float mWorkflowVersion);
void draw(int numberOfTracks);
void drawTPC(GID gid, float trackTime);
void drawITS(GID gid, float trackTime);
void drawMFT(GID gid, float trackTime);
Expand All @@ -136,6 +131,7 @@ class EveWorkflowHelper
void prepareITSClusters(const o2::itsmft::TopologyDictionary* dict); // fills mITSClustersArray
void prepareMFTClusters(const o2::itsmft::TopologyDictionary* dict); // fills mMFTClustersArray
void clear() { mEvent.clear(); }
bool isEmpty() { return mEvent.isEmpty(); }

void save(const std::string& jsonPath,
int numberOfFiles,
Expand Down
5 changes: 3 additions & 2 deletions EventVisualisation/Workflow/include/EveWorkflow/O2DPLDisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class O2DPLDisplaySpec : public o2::framework::Task
O2DPLDisplaySpec(bool useMC, o2::dataformats::GlobalTrackID::mask_t trkMask,
o2::dataformats::GlobalTrackID::mask_t clMask,
std::shared_ptr<o2::globaltracking::DataRequest> dataRequest, std::string jsonPath,
std::chrono::milliseconds timeInterval, int numberOfFiles, int numberOfTracks, bool eveHostNameMatch)
: mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mJsonPath(jsonPath), mTimeInteval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch)
std::chrono::milliseconds timeInterval, int numberOfFiles, int numberOfTracks, bool eveHostNameMatch, bool noEmptyOutput)
: mUseMC(useMC), mTrkMask(trkMask), mClMask(clMask), mDataRequest(dataRequest), mJsonPath(jsonPath), mTimeInteval(timeInterval), mNumberOfFiles(numberOfFiles), mNumberOfTracks(numberOfTracks), mEveHostNameMatch(eveHostNameMatch), mNoEmptyOutput(noEmptyOutput)
{
this->mTimeStamp = std::chrono::high_resolution_clock::now() - timeInterval; // first run meets condition
}
Expand All @@ -66,6 +66,7 @@ class O2DPLDisplaySpec : public o2::framework::Task

bool mUseMC = false;
bool mEveHostNameMatch; // empty or correct hostname
bool mNoEmptyOutput; // don't create files with no tracks/clusters
std::string mJsonPath; // folder where files are stored
std::chrono::milliseconds mTimeInteval; // minimal interval between files in miliseconds
int mNumberOfFiles; // maximun number of files in folder - newer replaces older
Expand Down
12 changes: 1 addition & 11 deletions EventVisualisation/Workflow/src/EveWorkflowHelper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,7 @@ void EveWorkflowHelper::selectTracks(const CalibObjectsConst* calib,
this->mRecoCont.createTracksVariadic(creator);
}

void EveWorkflowHelper::draw(const std::string& jsonPath,
int numberOfFiles,
int numberOfTracks,
o2::dataformats::GlobalTrackID::mask_t trkMask,
o2::dataformats::GlobalTrackID::mask_t clMask,
o2::header::DataHeader::RunNumberType runNumber,
o2::framework::DataProcessingHeader::CreationTime creation,
float workflowVersion)
void EveWorkflowHelper::draw(int numberOfTracks)
{
size_t nTracks = mTrackSet.trackGID.size();
if (numberOfTracks != -1 && numberOfTracks < nTracks) {
Expand Down Expand Up @@ -103,9 +96,6 @@ void EveWorkflowHelper::draw(const std::string& jsonPath,
LOG(info) << "Track type " << gid.getSource() << " not handled";
}
}

// save json file
save(jsonPath, numberOfFiles, trkMask, clMask, workflowVersion, runNumber, creation);
}

void EveWorkflowHelper::save(const std::string& jsonPath, int numberOfFiles,
Expand Down
14 changes: 11 additions & 3 deletions EventVisualisation/Workflow/src/O2DPLDisplay.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
{"read-from-files", o2::framework::VariantType::Bool, false, {"comma-separated list of tracks to display"}},
{"disable-root-input", o2::framework::VariantType::Bool, false, {"Disable root input overriding read-from-files"}},
{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}},
{"skipOnEmptyInput", o2::framework::VariantType::Bool, false, {"Just don't run the ED when no input is provided"}}};
{"skipOnEmptyInput", o2::framework::VariantType::Bool, false, {"Just don't run the ED when no input is provided"}},
{"no-empty-output", o2::framework::VariantType::Bool, false, {"don't create files with no tracks/clusters"}}};

std::swap(workflowOptions, options);
}
Expand Down Expand Up @@ -94,7 +95,12 @@ void O2DPLDisplaySpec::run(ProcessingContext& pc)
const auto* dh = DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
const auto* dph = DataRefUtils::getHeader<DataProcessingHeader*>(ref);

helper.draw(this->mJsonPath, this->mNumberOfFiles, this->mNumberOfTracks, this->mTrkMask, this->mClMask, dh->runNumber, dph->creation, this->mWorkflowVersion);
helper.draw(this->mNumberOfTracks);

if (!(this->mNoEmptyOutput && helper.isEmpty())) {
helper.save(this->mJsonPath, this->mNumberOfFiles, this->mTrkMask, this->mClMask, this->mWorkflowVersion, dh->runNumber, dph->creation);
}

auto endTime = std::chrono::high_resolution_clock::now();
LOGP(info, "Visualization of TF:{} at orbit {} took {} s.", dh->tfCounter, dh->firstTForbit, std::chrono::duration_cast<std::chrono::microseconds>(endTime - currentTime).count() * 1e-6);
}
Expand Down Expand Up @@ -172,11 +178,13 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
InputHelper::addInputSpecs(cfgc, specs, srcCl, srcTrk, srcTrk, useMC);
}

auto noEmptyFiles = cfgc.options().get<bool>("no-empty-output");

specs.emplace_back(DataProcessorSpec{
"o2-eve-display",
dataRequest->inputs,
{},
AlgorithmSpec{adaptFromTask<O2DPLDisplaySpec>(useMC, srcTrk, srcCl, dataRequest, jsonFolder, timeInterval, numberOfFiles, numberOfTracks, eveHostNameMatch)}});
AlgorithmSpec{adaptFromTask<O2DPLDisplaySpec>(useMC, srcTrk, srcCl, dataRequest, jsonFolder, timeInterval, numberOfFiles, numberOfTracks, eveHostNameMatch, noEmptyFiles)}});

return std::move(specs);
}