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
move Hit to common
  • Loading branch information
@AllaMaevskaya
AllaMaevskaya committed Mar 29, 2019
commit 9d0e919346a1e1ba4734bb91dcaf76d752d991d2
1 change: 0 additions & 1 deletion Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class TGraph;
namespace o2
{
namespace t0

{
class Geometry;
}
Expand Down
2 changes: 1 addition & 1 deletion Detectors/FIT/T0/simulation/include/T0Simulation/DigitizerTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class DigitizerTask : public FairTask
const std::vector<o2::t0::HitType>* mHitsArray = nullptr; ///< Array of MC hits

TBranch* mQEDBranch = nullptr; //! optional special branch of hits from QED collitions
const std::vector<o2::t0::HitType>* mHitsArrayQED = nullptr; //! array of MC hits from ED
const std::vector<o2::fit::HitType>* mHitsArrayQED = nullptr; //! array of MC hits from ED
float mQEDEntryTimeBinNS = 0.f; ///< every entry in the QED branch integrates QED for so many nanosec.
double mLastQEDTimeNS = 0.; ///< center of the time-bin of last added QED bg slot (entry of mQEDBranch)
int mLastQEDEntry = -1; ///< last used QED entry
Expand Down
5 changes: 5 additions & 0 deletions Detectors/FIT/common/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,14 @@ void Digitizer::initParameters()
// murmur
}
//_______________________________________________________________________
<<<<<<< HEAD
void Digitizer::init()
{
std::cout << " @@@ Digitizer::init " << std::endl;
=======
void Digitizer::init() {
std::cout<<" @@@ Digitizer::init "<<std::endl;
>>>>>>> move Hit to common
}

//_______________________________________________________________________
Expand Down
2 changes: 1 addition & 1 deletion Steer/DigitizerWorkflow/src/FITDigitWriterSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class FITDPLDigitWriter
void init(framework::InitContext& ic)
{
std::string detStrL = mID.getName();
std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);

auto filename = ic.options().get<std::string>((detStrL + "-digit-outfile").c_str());
auto treename = ic.options().get<std::string>("treename");
Expand Down
10 changes: 8 additions & 2 deletions Steer/DigitizerWorkflow/src/FITDigitizerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class FITDPLDigitizerTask

LOG(INFO) << "CALLING FIT DIGITIZATION";

static std::vector<o2::t0::HitType> hits;
static std::vector<o2::fit::HitType> hits;
o2::dataformats::MCTruthContainer<o2::MCCompLabel> labelAccum;
o2::dataformats::MCTruthContainer<o2::MCCompLabel> labels;
o2::fit::Digit digit;
Expand All @@ -114,8 +114,12 @@ class FITDPLDigitizerTask
for (auto& part : eventParts[collID]) {
// get the hits for this event and this source
hits.clear();
<<<<<<< HEAD
retrieveHits(mSimChains, part.sourceID, part.entryID, &hits);

=======
retrieveHits(mSimChains, "T0Hit", part.sourceID, part.entryID, &hits);
>>>>>>> move Hit to common
LOG(INFO) << "For collision " << collID << " eventID " << part.entryID << " found " << hits.size() << " hits ";

// call actual digitization procedure
Expand Down Expand Up @@ -203,9 +207,9 @@ class FITT0DPLDigitizerTask : public FITDPLDigitizerTask
mOrigin = DETOR;
std::cout << " @@@@ DETOR FITT0DPLDigitizerTask " << mOrigin << " " << mID.getName() << std::endl;
}

};

//_______________________________________________
class FITT0DPLDigitizerTask : public FITDPLDigitizerTask
{
public:
Expand All @@ -216,6 +220,7 @@ class FITT0DPLDigitizerTask : public FITDPLDigitizerTask
{
mID = DETID;
mOrigin = DETOR;
std::cout << " @@@@ DETOR FITT0DPLDigitizerTask " << mOrigin << " " << mID.getName() << std::endl;
}
};

Expand All @@ -232,6 +237,7 @@ o2::framework::DataProcessorSpec getFITT0DigitizerSpec(int channel)
std::string detStr = o2::detectors::DetID::getName(FITT0DPLDigitizerTask::DETID);
auto detOrig = FITT0DPLDigitizerTask::DETOR;
std::cout << "@@@@ getFITT0DigitizerSpec " << detStr << " dteOrig " << detOrig << std::endl;

return DataProcessorSpec{
(detStr + "Digitizer").c_str(),
Inputs{ InputSpec{ "collisioncontext", "SIM", "COLLISIONCONTEXT", static_cast<SubSpecificationType>(channel), Lifetime::Timeframe } },
Expand Down