Skip to content

Commit 7cfe7ce

Browse files
shahor02shahor02
committed
Make MID DataDescriptions pattern uniform with that of MCH
1 parent 3ed7743 commit 7cfe7ce

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

‎DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void DataRequest::requestMCHTracks(bool mc)
9393
void DataRequest::requestMIDTracks(bool mc)
9494
{
9595
addInput({"trackMIDROF", "MID", "TRACKROFS", 0, Lifetime::Timeframe});
96-
addInput({"trackClMIDROF", "MID", "TRCLUSROF", 0, Lifetime::Timeframe});
96+
addInput({"trackClMIDROF", "MID", "TRCLUSROFS", 0, Lifetime::Timeframe});
9797
addInput({"trackMID", "MID", "TRACKS", 0, Lifetime::Timeframe});
9898
addInput({"trackMIDTRACKCLUSTERS", "MID", "TRACKCLUSTERS", 0, Lifetime::Timeframe});
9999
if (mc) {

‎Detectors/MUON/MID/Workflow/src/TrackReaderSpec.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void printBranch(char* data, const char* what)
4141
RootTreeReader::SpecialPublishHook logging{
4242
[](std::string_view name, ProcessingContext&, Output const&, char* data) -> bool {
4343
if (name == "MIDTrackROF") {
44-
printBranch<ROFRecord>(data, "TRACKSROF");
44+
printBranch<ROFRecord>(data, "TRACKROFS");
4545
}
4646
if (name == "MIDTrackClusterROF") {
4747
printBranch<ROFRecord>(data, "TRCLUSROFS");
@@ -82,9 +82,9 @@ struct TrackReader {
8282
nofEntries,
8383
RootTreeReader::PublishingMode::Single,
8484
RootTreeReader::BranchDefinition<std::vector<Track>>{Output{"MID", "TRACKS", 0}, "MIDTrack"},
85-
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRACKSROF", 0}, "MIDTrackROF"},
85+
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRACKROFS", 0}, "MIDTrackROF"},
8686
RootTreeReader::BranchDefinition<std::vector<Cluster3D>>{Output{"MID", "TRACKCLUSTERS", 0}, "MIDTrackCluster"},
87-
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRCLUSROF", 0}, "MIDTrackClusterROF"},
87+
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRCLUSROFS", 0}, "MIDTrackClusterROF"},
8888
RootTreeReader::BranchDefinition<o2::dataformats::MCTruthContainer<MCCompLabel>>{Output{"MID", "TRACKLABELS", 0}, "MIDTrackLabels"},
8989
RootTreeReader::BranchDefinition<o2::dataformats::MCTruthContainer<MCClusterLabel>>{Output{"MID", "TRCLUSLABELS", 0}, "MIDTrackClusterLabels"},
9090
&logging);
@@ -95,9 +95,9 @@ struct TrackReader {
9595
nofEntries,
9696
RootTreeReader::PublishingMode::Single,
9797
RootTreeReader::BranchDefinition<std::vector<Track>>{Output{"MID", "TRACKS", 0}, "MIDTrack"},
98-
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRACKSROF", 0}, "MIDTrackROF"},
98+
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRACKROFS", 0}, "MIDTrackROF"},
9999
RootTreeReader::BranchDefinition<std::vector<Cluster3D>>{Output{"MID", "TRACKCLUSTERS", 0}, "MIDTrackCluster"},
100-
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRCLUSROF", 0}, "MIDTrackClusterROF"},
100+
RootTreeReader::BranchDefinition<std::vector<ROFRecord>>{Output{"MID", "TRCLUSROFS", 0}, "MIDTrackClusterROF"},
101101
&logging);
102102
}
103103
}
@@ -116,9 +116,9 @@ DataProcessorSpec getTrackReaderSpec(bool useMC, const char* specName)
116116
{
117117
std::vector<OutputSpec> outputSpecs;
118118
outputSpecs.emplace_back(OutputSpec{{"tracks"}, "MID", "TRACKS", 0, Lifetime::Timeframe});
119-
outputSpecs.emplace_back(OutputSpec{{"tracksrof"}, "MID", "TRACKSROF", 0, Lifetime::Timeframe});
119+
outputSpecs.emplace_back(OutputSpec{{"tracksrof"}, "MID", "TRACKROFS", 0, Lifetime::Timeframe});
120120
outputSpecs.emplace_back(OutputSpec{{"trackclusters"}, "MID", "TRACKCLUSTERS", 0, Lifetime::Timeframe});
121-
outputSpecs.emplace_back(OutputSpec{{"trclusrof"}, "MID", "TRCLUSROF", 0, Lifetime::Timeframe});
121+
outputSpecs.emplace_back(OutputSpec{{"trclusrof"}, "MID", "TRCLUSROFS", 0, Lifetime::Timeframe});
122122
if (useMC) {
123123
outputSpecs.emplace_back(OutputSpec{{"tracklabels"}, "MID", "TRACKLABELS", 0, Lifetime::Timeframe});
124124
outputSpecs.emplace_back(OutputSpec{{"trcluslabels"}, "MID", "TRCLUSLABELS", 0, Lifetime::Timeframe});

‎Detectors/MUON/MID/Workflow/src/TrackerMCSpec.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class TrackerMCDeviceDPL
7171
pc.outputs().snapshot(of::Output{"MID", "TRACKCLUSTERS", 0, of::Lifetime::Timeframe}, mTracker->getClusters());
7272
LOG(DEBUG) << "Sent " << mTracker->getClusters().size() << " track clusters.";
7373

74-
pc.outputs().snapshot(of::Output{"MID", "TRACKSROF", 0, of::Lifetime::Timeframe}, mTracker->getTrackROFRecords());
74+
pc.outputs().snapshot(of::Output{"MID", "TRACKROFS", 0, of::Lifetime::Timeframe}, mTracker->getTrackROFRecords());
7575
LOG(DEBUG) << "Sent " << mTracker->getTrackROFRecords().size() << " ROFs.";
76-
pc.outputs().snapshot(of::Output{"MID", "TRCLUSROF", 0, of::Lifetime::Timeframe}, mTracker->getClusterROFRecords());
76+
pc.outputs().snapshot(of::Output{"MID", "TRCLUSROFS", 0, of::Lifetime::Timeframe}, mTracker->getClusterROFRecords());
7777
LOG(DEBUG) << "Sent " << mTracker->getClusterROFRecords().size() << " ROFs.";
7878

7979
pc.outputs().snapshot(of::Output{"MID", "TRACKLABELS", 0, of::Lifetime::Timeframe}, mTrackLabeler.getTracksLabels());
@@ -95,8 +95,8 @@ framework::DataProcessorSpec getTrackerMCSpec()
9595
std::vector<of::OutputSpec> outputSpecs{
9696
of::OutputSpec{"MID", "TRACKS"},
9797
of::OutputSpec{"MID", "TRACKCLUSTERS"},
98-
of::OutputSpec{"MID", "TRACKSROF"},
99-
of::OutputSpec{"MID", "TRCLUSROF"},
98+
of::OutputSpec{"MID", "TRACKROFS"},
99+
of::OutputSpec{"MID", "TRCLUSROFS"},
100100
of::OutputSpec{"MID", "TRACKLABELS"},
101101
of::OutputSpec{"MID", "TRCLUSLABELS"}};
102102

‎Detectors/MUON/MID/Workflow/src/TrackerSpec.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ class TrackerDeviceDPL
7878
pc.outputs().snapshot(of::Output{"MID", "TRACKCLUSTERS", 0, of::Lifetime::Timeframe}, mTracker->getClusters());
7979
LOG(DEBUG) << "Sent " << mTracker->getClusters().size() << " track clusters.";
8080

81-
pc.outputs().snapshot(of::Output{"MID", "TRACKSROF", 0, of::Lifetime::Timeframe}, mTracker->getTrackROFRecords());
81+
pc.outputs().snapshot(of::Output{"MID", "TRACKROFS", 0, of::Lifetime::Timeframe}, mTracker->getTrackROFRecords());
8282
LOG(DEBUG) << "Sent " << mTracker->getTrackROFRecords().size() << " ROFs.";
83-
pc.outputs().snapshot(of::Output{"MID", "TRCLUSROF", 0, of::Lifetime::Timeframe}, mTracker->getClusterROFRecords());
83+
pc.outputs().snapshot(of::Output{"MID", "TRCLUSROFS", 0, of::Lifetime::Timeframe}, mTracker->getClusterROFRecords());
8484
LOG(DEBUG) << "Sent " << mTracker->getClusterROFRecords().size() << " ROFs.";
8585

8686
mTimer += std::chrono::high_resolution_clock::now() - tStart;
@@ -101,8 +101,8 @@ framework::DataProcessorSpec getTrackerSpec()
101101
std::vector<of::OutputSpec> outputSpecs{
102102
of::OutputSpec{"MID", "TRACKS"},
103103
of::OutputSpec{"MID", "TRACKCLUSTERS"},
104-
of::OutputSpec{"MID", "TRACKSROF"},
105-
of::OutputSpec{"MID", "TRCLUSROF"}};
104+
of::OutputSpec{"MID", "TRACKROFS"},
105+
of::OutputSpec{"MID", "TRCLUSROFS"}};
106106

107107
return of::DataProcessorSpec{
108108
"MIDTracker",

‎Detectors/MUON/MID/Workflow/src/reco-workflow.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
7777
"midreco",
7878
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::Track>>{InputSpec{"mid_tracks", o2::header::gDataOriginMID, "TRACKS"}, "MIDTrack"},
7979
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::Cluster3D>>{InputSpec{"mid_trclus", o2::header::gDataOriginMID, "TRACKCLUSTERS"}, "MIDTrackCluster"},
80-
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::ROFRecord>>{InputSpec{"mid_tracks_rof", o2::header::gDataOriginMID, "TRACKSROF"}, "MIDTrackROF"},
81-
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::ROFRecord>>{InputSpec{"mid_trclus_rof", o2::header::gDataOriginMID, "TRCLUSROF"}, "MIDTrackClusterROF"},
80+
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::ROFRecord>>{InputSpec{"mid_tracks_rof", o2::header::gDataOriginMID, "TRACKROFS"}, "MIDTrackROF"},
81+
MakeRootTreeWriterSpec::BranchDefinition<std::vector<o2::mid::ROFRecord>>{InputSpec{"mid_trclus_rof", o2::header::gDataOriginMID, "TRCLUSROFS"}, "MIDTrackClusterROF"},
8282
MakeRootTreeWriterSpec::BranchDefinition<o2::dataformats::MCTruthContainer<o2::MCCompLabel>>{InputSpec{"mid_track_labels", o2::header::gDataOriginMID, "TRACKLABELS"}, "MIDTrackLabels", disableMC ? 0 : 1},
8383
MakeRootTreeWriterSpec::BranchDefinition<o2::dataformats::MCTruthContainer<o2::mid::MCClusterLabel>>{InputSpec{"mid_trclus_labels", o2::header::gDataOriginMID, "TRCLUSLABELS"}, "MIDTrackClusterLabels", disableMC ? 0 : 1})());
8484
}

‎Detectors/MUON/Workflow/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
o2-muon-tracks-matcher-workflow
1818
```
1919

20-
Take as input the lists of MCH tracks ([TrackMCH](../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/TrackMCH.h)), MCH ROF records ([ROFRecord](../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)), MID tracks ([Track](../../../DataFormats/Detectors/MUON/MID/include/DataFormatsMID/Track.h)) and MID ROF records ([ROFRecord](../../../DataFormats/Detectors/MUON/MID/include/DataFormatsMID/ROFRecord.h)) in the current time frame, with the data descriptions "MCH/TRACKS", "MCH/TRACKROFS", "MID/TRACKS" and "MID/TRACKSROF", respectively. Send the list of matched tracks ([TrackMCHMID](../../../DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackMCHMID.h)) in the time frame, with the data description "GLO/MCHMID".
20+
Take as input the lists of MCH tracks ([TrackMCH](../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/TrackMCH.h)), MCH ROF records ([ROFRecord](../../../DataFormats/Detectors/MUON/MCH/include/DataFormatsMCH/ROFRecord.h)), MID tracks ([Track](../../../DataFormats/Detectors/MUON/MID/include/DataFormatsMID/Track.h)) and MID ROF records ([ROFRecord](../../../DataFormats/Detectors/MUON/MID/include/DataFormatsMID/ROFRecord.h)) in the current time frame, with the data descriptions "MCH/TRACKS", "MCH/TRACKROFS", "MID/TRACKS" and "MID/TRACKROFS", respectively. Send the list of matched tracks ([TrackMCHMID](../../../DataFormats/Reconstruction/include/ReconstructionDataFormats/TrackMCHMID.h)) in the time frame, with the data description "GLO/MCHMID".
2121

2222
Option `--config "file.json"` or `--config "file.ini"` allows to change the matching parameters from a configuration file. This file can be either in JSON or in INI format, as described below:
2323

‎Detectors/MUON/Workflow/src/TrackMatcherSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ DataProcessorSpec getTrackMatcherSpec(const char* name)
9191
name,
9292
Inputs{InputSpec{"mchrofs", "MCH", "TRACKROFS", 0, Lifetime::Timeframe},
9393
InputSpec{"mchtracks", "MCH", "TRACKS", 0, Lifetime::Timeframe},
94-
InputSpec{"midrofs", "MID", "TRACKSROF", 0, Lifetime::Timeframe},
94+
InputSpec{"midrofs", "MID", "TRACKROFS", 0, Lifetime::Timeframe},
9595
InputSpec{"midtracks", "MID", "TRACKS", 0, Lifetime::Timeframe}},
9696
Outputs{OutputSpec{{"muontracks"}, "GLO", "MCHMID", 0, Lifetime::Timeframe}},
9797
AlgorithmSpec{adaptFromTask<TrackMatcherTask>()},

0 commit comments

Comments
 (0)