explicit added

Author: AllaMaevskaya

Detectors/FIT/T0/macros/readHitsDigits.C

@@ -1,90 +1,93 @@
-#include "T0Simulation/Detector.h"
+#if !defined(__CLING__) || defined(__ROOTCLING__)
 #include "FITBase/Digit.h"
+#include "FITSimulation/HitType.h"
 #include <TH2F.h>
-void readHitsDigits() 
+#include <TTree.h>
+#include <TFile.h>
+void readHitsDigits()
 {
   using namespace o2::fit;
   //  using namespace o2::fit::Digit;
- 
+
   // Create histograms
   TDirectory* cwd = gDirectory;
   gDirectory = 0x0;
- 
-  TH2F *hMultHit = new TH2F("hMultHits","photons Hits ",210, 0, 210, 500, 0, 5000);
-  TH2F *hTimeHitA = new TH2F("hTimeAhit", "Time Hits", 210, 0, 210, 1000, 11, 12);  
-  TH2F *hTimeHitC = new TH2F("hTimeChit", "Time Hits", 210, 0, 210, 1000, 2.8, 3.8);  
-  TH2F *hMultDig = new TH2F("hMultDig","photons Digits ",210, 0, 210, 500, 0, 20);
-  TH2F *hTimeDig = new TH2F("hTimeDig", "Time Digits", 210, 0, 210, 100, -1, 1);  
 
-  gDirectory = cwd; 
-  
-  TFile *fhit = new TFile("o2sim.root");
-  TTree *hitTree = (TTree*)fhit->Get("o2sim");
+  TH2F* hMultHit = new TH2F("hMultHits", "photons Hits ", 210, 0, 210, 500, 0, 5000);
+  TH2F* hTimeHitA = new TH2F("hTimeAhit", "Time Hits", 210, 0, 210, 1000, 11, 12);
+  TH2F* hTimeHitC = new TH2F("hTimeChit", "Time Hits", 210, 0, 210, 1000, 2.8, 3.8);
+  TH2F* hMultDig = new TH2F("hMultDig", "photons Digits ", 210, 0, 210, 500, 0, 20);
+  TH2F* hTimeDig = new TH2F("hTimeDig", "Time Digits", 210, 0, 210, 100, -1, 1);
+
+  gDirectory = cwd;
+
+  TFile* fhit = new TFile("o2sim.root");
+  TTree* hitTree = (TTree*)fhit->Get("o2sim");
   std::vector<o2::fit::HitType>* hitArray = nullptr;
   hitTree->SetBranchAddress("T0Hit", &hitArray);
   Int_t nevH = hitTree->GetEntries(); // hits are stored as one event per entry
   // std::cout << "Found " << nevH << " events with hits " << std::endl;
-  
+
   Double_t hit_time[240];
   Int_t countE[240];
-   // Event ------------------------- LOOP  
-  for (Int_t ievent=0; ievent<nevH; ievent++){
+  // Event ------------------------- LOOP
+  for (Int_t ievent = 0; ievent < nevH; ievent++) {
     hitTree->GetEntry(ievent);
-    for (int ii=0; ii<240; ii++)  { countE[ii]=0;hit_time[ii]=0; }
+    for (int ii = 0; ii < 240; ii++) {
+      countE[ii] = 0;
+      hit_time[ii] = 0;
+    }
     for (auto& hit : *hitArray) {
       Int_t detID = hit.GetDetectorID();
       hit_time[detID] = hit.GetTime();
-      hTimeHitA -> Fill(detID, hit_time[detID]);
-      hTimeHitC -> Fill(detID, hit_time[detID]);
-     countE[detID]++;
+      hTimeHitA->Fill(detID, hit_time[detID]);
+      hTimeHitC->Fill(detID, hit_time[detID]);
+      countE[detID]++;
     }
-    for (int ii=0; ii<208; ii++) {
-      if (countE[ii]>100) {
-	hMultHit -> Fill(ii, countE[ii]);
-	//	std::cout<<ii<<" "<<countE[ii]<<endl;
+    for (int ii = 0; ii < 208; ii++) {
+      if (countE[ii] > 100) {
+        hMultHit->Fill(ii, countE[ii]);
+        //	std::cout<<ii<<" "<<countE[ii]<<endl;
       }
     }
   }
-  
+
   TFile* fdig = TFile::Open("t0digits.root");
   std::cout << " Open digits file " << std::endl;
   TTree* digTree = (TTree*)fdig->Get("o2sim");
-  std::vector<o2::fit::Digit> * digArr = new std::vector<Digit>;
+  std::vector<o2::fit::Digit>* digArr = new std::vector<Digit>;
   digTree->SetBranchAddress("T0Digit", &digArr);
   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::cout << "Found " << nevD << " events with digits " << std::endl;
   Float_t cfd[208], amp[208], part[208];
   for (Int_t iev = 0; iev < nevD; iev++) {
     digTree->GetEvent(iev);
     for (const auto& digit : *digArr) {
-      for (int ii=0; ii<208; ii++)  { cfd[ii]=amp[ii]=0; }
+      for (int ii = 0; ii < 208; ii++) {
+        cfd[ii] = amp[ii] = 0;
+      }
       Double_t evtime = digit.getTime();
       for (const auto& d : digit.getChDgData()) {
-	Int_t mcp = d.ChId;
-	cfd[mcp] = d.CFDTime - evtime - 12.5;
-	amp[mcp] = d.QTCAmpl;
-	part[mcp] = d.numberOfParticles;
-	cout<<iev<<" "<<mcp<<" "<< cfd[mcp]<<" "<< amp[mcp]<<" "<<part[mcp]<<endl;
-	hMultDig ->Fill(Float_t (mcp),amp[mcp]); 
-	hTimeDig ->Fill(Float_t (mcp),cfd[mcp]);
+        Int_t mcp = d.ChId;
+        cfd[mcp] = d.CFDTime - evtime - 12.5;
+        amp[mcp] = d.QTCAmpl;
+        part[mcp] = d.numberOfParticles;
+        //     cout << iev << " " << mcp << " " << cfd[mcp] << " " << amp[mcp] << " " << part[mcp] << endl;
+        hMultDig->Fill(Float_t(mcp), amp[mcp]);
+        hTimeDig->Fill(Float_t(mcp), cfd[mcp]);
       }
     }
-  } 
-  TFile *Hfile = new TFile("FigFit_hits_pp.root","RECREATE");
+  }
+  TFile* Hfile = new TFile("FigFit_hits_pp.root", "RECREATE");
   printf("Writting histograms to root file \n");
-   Hfile->cd();
+  Hfile->cd();
   //Create a canvas, set the view range, show histograms
   //  TCanvas *c1 = new TCanvas("c1","Alice T0 Time ",400,10,600,600);
   hTimeHitA->Write();
   hTimeHitC->Write();
   hMultHit->Write();
   hTimeDig->Write();
   hMultDig->Write();
- 
 
 } // end of macro
-
-
-
-
-
+#endif

Detectors/FIT/T0/macros/run_reco_t0.C

@@ -15,57 +15,58 @@
 #endif
 
 void run_reco_t0(std::string inpudDig = "t0digits.root",
-		  std::string outName = "o2reco_t0.root",
-		  std::string inputGRP = "o2sim_grp.root") {
+                 std::string outName = "o2reco_t0.root",
+                 std::string inputGRP = "o2sim_grp.root")
+{
 
   // Initialize logger
-  FairLogger *logger = FairLogger::GetLogger();
+  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>;
+  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");
+
+  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++) {
+  for (int iEv = 0; iEv < nevD; iEv++) {
     digTree->GetEntry(iEv);
     recPointsP->resize(digits->size());
-    for (size_t collID=0; collID < digits->size(); ++collID)
+    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;
+
+  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;
-  
+            << "s" << std::endl
+            << std::endl;
 }

Detectors/FIT/V0/base/src/Geometry.cxx

@@ -25,18 +25,21 @@ ClassImp(o2::v0::Geometry);
 
 using namespace o2::v0;
 
-Geometry::Geometry(EGeoType initType){
+Geometry::Geometry(EGeoType initType)
+{
   mGeometryType = initType;
   initializeVectors();
   initializeLuts();
   buildGeometry();
 }
 
-Geometry::Geometry(const Geometry& geom){
+Geometry::Geometry(const Geometry& geom)
+{
   this->mGeometryType = geom.mGeometryType;
 }
 
-void Geometry::initializeVectors(){
+void Geometry::initializeVectors()
+{
   // RADII
   // Index of rAvgScint is NOT linked directly to any ring number
   mvrAvgScint.push_back(4.01); // ring 1 lower radius
@@ -47,25 +50,26 @@ void Geometry::initializeVectors(){
   mvrAvgScint.push_back(72.09);
 
   // Set real plastic radi (reduced by painting of 0.06 and separation gap of 0.08)
-  for(uint16_t ir=1; ir<mvrAvgScint.size(); ir++) { // shift of indices to match index with ring number (starting from 0)
+  for (uint16_t ir = 1; ir < mvrAvgScint.size(); ir++) { // shift of indices to match index with ring number (starting from 0)
     mvrMaxScint.push_back(mvrAvgScint.at(ir) - sDrSeparationScint);
   }
-  for(uint16_t ir=0; ir<mvrAvgScint.size()-1; ir++) {
+  for (uint16_t ir = 0; ir < mvrAvgScint.size() - 1; ir++) {
     mvrMinScint.push_back(mvrAvgScint.at(ir) + sDrSeparationScint);
   }
   // Now indices of rMinScint and rMaxScint correspond to the same ring
 
   // AZIMUTH
-  for(uint16_t isector=0; isector<sBaseNumberOfSectors; isector++){
-    float phiMin = sPhiMinScint + isector*sDphiScint + sGlobalPhiRotation;
+  for (uint16_t isector = 0; isector < sBaseNumberOfSectors; isector++) {
+    float phiMin = sPhiMinScint + isector * sDphiScint + sGlobalPhiRotation;
     std::stringstream ssNameRot;
     ssNameRot << "rotPhiSector" << isector;
     mvPhiRot.push_back(new TGeoRotation(ssNameRot.str().c_str(), phiMin, 0.0, 0.0));
-    mvPhiRot.at(mvPhiRot.size()-1)->RegisterYourself();
+    mvPhiRot.at(mvPhiRot.size() - 1)->RegisterYourself();
   }
 }
 
-void Geometry::buildGeometry(){
+void Geometry::buildGeometry()
+{
   TGeoVolume* vALIC = gGeoManager->GetVolume("cave");
   if (!vALIC) {
     LOG(FATAL) << "Could not find the top volume";
@@ -76,46 +80,49 @@ void Geometry::buildGeometry(){
   LOG(INFO) << "Geometry::buildGeometry()::Volume name = " << volV0->GetName();
   assembleSectors(volV0);
 
-  TGeoTranslation* trGlobalZshift = new TGeoTranslation(0,0,sZposition);
+  TGeoTranslation* trGlobalZshift = new TGeoTranslation(0, 0, sZposition);
 
   vALIC->AddNode(volV0, 0, trGlobalZshift);
 }
 
-TGeoVolumeAssembly* Geometry::buildSector(uint16_t iSector){
+TGeoVolumeAssembly* Geometry::buildSector(uint16_t iSector)
+{
   new TGeoBBox("boolBoxScintSeparator", mvrMaxScint.at(mvrMaxScint.size() - 1), sDySeparationScint * 2, sDzScint + sEpsilon);
 
   std::stringstream ssName;
-  ssName << "sector" << iSector+1;
-  TGeoVolumeAssembly *sector = new TGeoVolumeAssembly(ssName.str().c_str());
-  for(uint16_t ir=0; ir<mvrMinScint.size(); ir++){ // loop over rings
-    int iCell = iSector*mvrMinScint.size() + ir;
+  ssName << "sector" << iSector + 1;
+  TGeoVolumeAssembly* sector = new TGeoVolumeAssembly(ssName.str().c_str());
+  for (uint16_t ir = 0; ir < mvrMinScint.size(); ir++) { // loop over rings
+    int iCell = iSector * mvrMinScint.size() + ir;
     std::stringstream ssNameGeoTube, ssNameGeoComposite;
-    ssNameGeoTube << "cellGeoTube" << iCell+1;
-    ssNameGeoComposite << "cellGeoComposite" << iCell+1;
+    ssNameGeoTube << "cellGeoTube" << iCell + 1;
+    ssNameGeoComposite << "cellGeoComposite" << iCell + 1;
 
     // Generate separation between sectors by subtracting two cuboids from each tube segment
     new TGeoTubeSeg(ssNameGeoTube.str().c_str(), mvrMinScint.at(ir), mvrMaxScint.at(ir), sDzScint, sPhiMinScint, sDphiScint);
     std::string booleanFormula = "(";
-    booleanFormula += ssNameGeoTube.str() + "-boolBoxScintSeparator)";          // subtract counter-clockwise box
-    booleanFormula += (std::string)"-boolBoxScintSeparator" + ":rotPhiSector1"; // subtract clockwise box (same but rotated by 45 degrees)
+    booleanFormula += ssNameGeoTube.str() + "-boolBoxScintSeparator)";           // subtract counter-clockwise box
+    booleanFormula += (std::string) "-boolBoxScintSeparator" + ":rotPhiSector1"; // subtract clockwise box (same but rotated by 45 degrees)
     TGeoCompositeShape* geoCell = new TGeoCompositeShape(ssNameGeoComposite.str().c_str(), booleanFormula.c_str());
 
     TGeoMedium* kMed = gGeoManager->GetMedium("V0_Scintillator$");
     TGeoVolume* volCell = new TGeoVolume("V0cell", geoCell, kMed);
 
     volCell->SetLineColor(kYellow);
-    sector->AddNode(volCell, iCell+1);
+    sector->AddNode(volCell, iCell + 1);
   }
   return sector;
 }
 
-void Geometry::assembleSectors(TGeoVolumeAssembly *volV0){
-  for(uint16_t isector=0; isector<mvPhiRot.size(); isector++){
-    TGeoVolumeAssembly *sector = buildSector(isector);
-    volV0->AddNode(sector, isector+1, mvPhiRot.at(isector));
+void Geometry::assembleSectors(TGeoVolumeAssembly* volV0)
+{
+  for (uint16_t isector = 0; isector < mvPhiRot.size(); isector++) {
+    TGeoVolumeAssembly* sector = buildSector(isector);
+    volV0->AddNode(sector, isector + 1, mvPhiRot.at(isector));
   }
 }
 
-void Geometry::initializeLuts(){
+void Geometry::initializeLuts()
+{
   // TODO: initialize sth
 }