Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 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
ffa30ca
Merge pull request #6 from mslupeck/dev
AllaMaevskaya Mar 30, 2019
a705103
clang fixed
AllaMaevskaya Mar 30, 2019
0290ee5
explicit added
AllaMaevskaya Mar 31, 2019
ab36798
remove empty line in HitMerger.h: clang complains
AllaMaevskaya Mar 31, 2019
1ead442
remove unused macros
AllaMaevskaya Mar 31, 2019
939e2a2
fix T0 part
AllaMaevskaya Mar 31, 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
add run_reco_t0
  • Loading branch information
AllaMaevskaya committed Mar 29, 2019
commit 15dc66a45710d68eafd1eaa522d751be4ad86352
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CollisionTimeRecoTask::CollisionTimeRecoTask()
void CollisionTimeRecoTask::Process(const Digit& digits,
RecPoints& recPoints) const
{
LOG(INFO) << "Running reconstruction on new event" << FairLogger::endl;
// LOG(INFO) << "Running reconstruction on new event" << FairLogger::endl;
recPoints.FillFromDigits(digits);
}
//________________________________________________________
Expand Down
49 changes: 18 additions & 31 deletions Detectors/FIT/T0/reconstruction/src/RecPoints.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ ClassImp(o2::t0::RecPoints);

void RecPoints::FillFromDigits(const o2::fit::Digit& digit)
{
mTimeAmp.clear();
mCollisionTime = {};

Int_t ndigitsC = 0, ndigitsA = 0;
constexpr Int_t nMCPsA = 4 * o2::t0::Geometry::NCellsA;
constexpr Int_t nMCPsC = 4 * o2::t0::Geometry::NCellsC;
constexpr Int_t nMCPs = nMCPsA + nMCPsC;
Float_t cfd[nMCPs] = {}, amp[nMCPs] = {};
Float_t sideAtime = 0, sideCtime = 0;

mBC = digit.getBC();
Expand All @@ -37,39 +35,28 @@ void RecPoints::FillFromDigits(const o2::fit::Digit& digit)

Float_t BCEventTime = 12.5;

for (const auto& d : digit.getChDgData()) {
Int_t mcp = d.ChId;
cfd[mcp] = d.CFDTime - mEventTime - BCEventTime;
amp[mcp] = d.QTCAmpl;
mTimeAmp.push_back(ChannelData{ mcp, cfd[mcp], amp[mcp] });
// LOG(DEBUG) << " mcp " << mcp<<" time "<< cfd[mcp]<<" amplitude "<< amp[mcp] << FairLogger::endl;
}

for (Int_t imcp = 0; imcp < nMCPsA; imcp++) {
if (cfd[imcp] > -2 && cfd[imcp] < 2) {
sideAtime += (cfd[imcp]);
ndigitsA++;
}
}
for (Int_t imcp = 0; imcp < nMCPsC; imcp++) {
if (cfd[imcp + nMCPsA] > 0) {
sideCtime += (cfd[imcp + nMCPsA]);
ndigitsC++;
mTimeAmp = digit.getChDgData();
for (auto& d : mTimeAmp) {
d.CFDTime -= mEventTime /*- BCEventTime*/;
if (abs(d.CFDTime - BCEventTime) < 2) {
if (d.ChId < nMCPsA) {
sideAtime += d.CFDTime;
ndigitsA++;
} else {
sideCtime += d.CFDTime;
ndigitsC++;
}
}
}

if (ndigitsA > 0)
sideAtime = sideAtime / Float_t(ndigitsA);
mCollisionTime[1] = sideAtime / Float_t(ndigitsA);

if (ndigitsC > 0)
sideCtime = sideCtime / Float_t(ndigitsC);
mCollisionTime[2] = sideCtime / Float_t(ndigitsC);

if (sideAtime > 0 && sideCtime > 0) {
mVertex = (sideAtime - sideCtime) / 2.;
mCollisionTime[0] = (sideAtime + sideCtime) / 2.;
}
if (sideAtime > 0) {
mCollisionTime[1] = sideAtime;
}
if (sideCtime > 0) {
mCollisionTime[2] = sideCtime;
if (ndigitsA > 0 && ndigitsC > 0) {
mVertex = (mCollisionTime[1] - mCollisionTime[2]) / 2.;
mCollisionTime[0] = (mCollisionTime[1] + mCollisionTime[2]) / 2.;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#pragma link C++ class o2::t0::CollisionTimeRecoTask + ;
#pragma link C++ class o2::t0::RecPoints + ;
#pragma link C++ class std::vector < o2::t0::RecPoints > +;
#pragma link C++ class o2::t0::Channel + ;

#endif
72 changes: 72 additions & 0 deletions Detectors/FIT/macros/run_reco_t0.C
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#if !defined(__CLING__) || defined(__ROOTCLING__)
#include <Rtypes.h>
#include <TString.h>
#include <TStopwatch.h>
#include <TGeoManager.h>
#include <TFile.h>
#include <TTree.h>
#include <iostream>

#include "FairLogger.h"

#include "T0Reconstruction/CollisionTimeRecoTask.h"
#include "T0Reconstruction/RecPoints.h"
#include "FITBase/Digit.h"
#endif

void run_reco_t0(std::string inpudDig = "t0digits.root",
std::string outName = "o2reco_t0.root",
std::string inputGRP = "o2sim_grp.root")
{

// Initialize logger
FairLogger* logger = FairLogger::GetLogger();
logger->SetLogVerbosityLevel("LOW");
logger->SetLogScreenLevel("DEBUG");

// Setup timer
TStopwatch timer;

TFile* fdig = TFile::Open("t0digits.root");
std::cout << " Open digits file " << std::endl;
TTree* digTree = (TTree*)fdig->Get("o2sim");
digTree->Print();
std::vector<o2::fit::Digit>* digits = new std::vector<o2::fit::Digit>;
digTree->SetBranchAddress("T0Digit", &digits);
Int_t nevD = digTree->GetEntries(); // digits in cont. readout may be grouped as few events per entry
std::cout << "Found " << nevD << " events with digits " << std::endl;

//std::vector<o2::fit::RecPoints> recPoints;
std::vector<o2::t0::RecPoints>* recPointsP = new std::vector<o2::t0::RecPoints>;

TFile outFile(outName.c_str(), "recreate");
TTree outTree("o2sim", "T0RecPoints");
outTree.Branch("T0Cluster", &recPointsP);

o2::t0::CollisionTimeRecoTask recoFIT;
timer.Start();
for (int iEv = 0; iEv < nevD; iEv++) {
digTree->GetEntry(iEv);
recPointsP->resize(digits->size());
for (size_t collID = 0; collID < digits->size(); ++collID)
recoFIT.Process((*digits)[collID], (*recPointsP)[collID]);
outTree.Fill();
}

outTree.Print();
outFile.ls();
timer.Stop();
outTree.Write();
Double_t rtime = timer.RealTime();
Double_t ctime = timer.CpuTime();

Float_t cpuUsage = ctime / rtime;
std::cout << "<DartMeasurement name=\"CpuLoad\" type=\"numeric/double\">";
std::cout << cpuUsage;
std::cout << "</DartMeasurement>" << std::endl;
std::cout << "Macro finished succesfully." << std::endl;

std::cout << "Real time " << rtime << " s, CPU time " << ctime
<< "s" << std::endl
<< std::endl;
}