Skip to content

FIT, V0+ and T0+ separated #1839

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

Closed
mslupeck wants to merge 21 commits into from
Closed

FIT, V0+ and T0+ separated #1839

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
195f1c2
first separation T0 V0
AllaMaevskaya Jan 18, 2019
4b6daad
T0 simulation works with this
AllaMaevskaya Jan 22, 2019
2e5709a
move Hit to common
AllaMaevskaya Jan 23, 2019
9abcec9
T0 digitzation as a part of FIT
AllaMaevskaya Jan 26, 2019
15dc66a
add run_reco_t0
AllaMaevskaya Feb 6, 2019
cb8dc52
Added V0: Detector and Geometry classes; no proper hits yet
mslupeck Mar 19, 2019
0acd64a
first separation T0 V0
AllaMaevskaya Jan 18, 2019
83f3b13
T0 simulation works with this
AllaMaevskaya Jan 22, 2019
f1b2bfa
move Hit to common
AllaMaevskaya Jan 23, 2019
a8f333c
T0 digitzation as a part of FIT
AllaMaevskaya Jan 26, 2019
8553ebd
add run_reco_t0
AllaMaevskaya Feb 6, 2019
8100ae2
first separation T0 V0
AllaMaevskaya Jan 18, 2019
d748e72
T0 simulation works with this
AllaMaevskaya Jan 22, 2019
9d0e919
move Hit to common
AllaMaevskaya Jan 23, 2019
a75c6e1
T0 digitzation as a part of FIT
AllaMaevskaya Jan 26, 2019
419cfdc
add run_reco_t0
AllaMaevskaya Feb 6, 2019
297b9f7
remove <<<< after mergeing
AllaMaevskaya Mar 28, 2019
314bd43
fix conflict
AllaMaevskaya Mar 29, 2019
a04fde0
merge with V0
AllaMaevskaya Mar 29, 2019
dcb3915
Fixed material definition in FIT-V0+
mslupeck Mar 30, 2019
e1891d2
Fix T0 digitizer code quality
mslupeck Mar 30, 2019
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
Prev Previous commit
Next Next commit
T0 simulation works with this
  • Loading branch information
@AllaMaevskaya
AllaMaevskaya committed Mar 29, 2019
commit d748e728fadb4391c39f2e2bb1ab13ea7d1fb013
1 change: 0 additions & 1 deletion Steer/DigitizerWorkflow/src/FITDigitWriterSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ namespace fit
{

o2::framework::DataProcessorSpec getT0DigitWriterSpec();
//o2::framework::DataProcessorSpec getMFTDigitWriterSpec();

} // namespace fit
} // end namespace o2
Expand Down
18 changes: 17 additions & 1 deletion Steer/DigitizerWorkflow/src/FITDigitizerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class FITDPLDigitizerTask
// get the hits for this event and this source
hits.clear();
retrieveHits(mSimChains, part.sourceID, part.entryID, &hits);

LOG(INFO) << "For collision " << collID << " eventID " << part.entryID << " found " << hits.size() << " hits ";

// call actual digitization procedure
Expand Down Expand Up @@ -147,7 +148,8 @@ class FITDPLDigitizerTask
// here we have all digits and we can send them to consumer (aka snapshot it onto output)
pc.outputs().snapshot(Output{ mOrigin, "DIGITS", 0, Lifetime::Timeframe }, digitAccum);
// pc.outputs().snapshot(Output{ "FIT", "DIGITSMCTR", 0, Lifetime::Timeframe }, labelAccum);
LOG(INFO) << "FIT: " << mID.getName() << " Sending ROMode= " << mROMode << " to GRPUpdater";

LOG(INFO) << "FIT: Sending ROMode= " << mROMode << " to GRPUpdater";
pc.outputs().snapshot(Output{ mOrigin, "ROMode", 0, Lifetime::Timeframe }, mROMode);
timer.Stop();
LOG(INFO) << "Digitization took " << timer.CpuTime() << "s";
Expand Down Expand Up @@ -203,6 +205,20 @@ class FITT0DPLDigitizerTask : public FITDPLDigitizerTask
}
};

//_______________________________________________
class FITT0DPLDigitizerTask : public FITDPLDigitizerTask
{
public:
// FIXME: origina should be extractable from the DetID, the problem is 3d party header dependencies
static constexpr o2::detectors::DetID::ID DETID = o2::detectors::DetID::T0;
static constexpr o2::header::DataOrigin DETOR = o2::header::gDataOriginT0;
FITT0DPLDigitizerTask()
{
mID = DETID;
mOrigin = DETOR;
}
};

constexpr o2::detectors::DetID::ID FITT0DPLDigitizerTask::DETID;
constexpr o2::header::DataOrigin FITT0DPLDigitizerTask::DETOR;

Expand Down