printout

Author: AllaMaevskaya

DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/LookUpTable.h

@@ -22,7 +22,6 @@
 #include "CCDB/BasicCCDBManager.h"
 
 #include <Rtypes.h>
-#include <bits/stdint-uintn.h>
 #include <cassert>
 #include <exception>
 #include <iostream>
@@ -133,18 +132,16 @@ class LookUpTable
 
   int getLink(int channel) const
   {
-    std::cout << " getLink for " << channel << " link " << mTopoVector[channel].mPM << std::endl;
     return mTopoVector[channel].mPM;
   }
   int getMCP(int channel) const
   {
-    std::cout << " getLink " << channel << " mcp " << mTopoVector[channel].mMCP << std::endl;
     return mTopoVector[channel].mMCP;
   }
 
   static o2::ft0::LookUpTable linear()
   {
-    std::vector<o2::ft0::Topo> lut_data(NUMBER_OF_MCPs * NUMBER_OF_PMs - 8);
+    std::vector<o2::ft0::Topo> lut_data(NUMBER_OF_MCPs * NUMBER_OF_PMs);
     for (int link = 0; link < NUMBER_OF_PMs; ++link) {
       for (int mcp = 0; mcp < NUMBER_OF_MCPs; ++mcp) {
         lut_data[link * NUMBER_OF_MCPs + mcp] = o2::ft0::Topo{link, mcp};
@@ -185,21 +182,17 @@ class LookUpTable
   static o2::ft0::LookUpTable readTable()
   {
 
-    std::vector<o2::ft0::Topo> lut_data; //(NUMBER_OF_MCPs * NUMBER_OF_PMs - 8);
+    std::vector<o2::ft0::Topo> lut_data;
     auto& mgr = o2::ccdb::BasicCCDBManager::instance();
     mgr.setURL("http://ccdb-test.cern.ch:8080");
     auto hvch = mgr.get<std::vector<o2::ft0::HVchannel>>("FT0/LookUpTable");
-    std::cout << hvch->size() << std::endl;
     size_t max = 0;
     for (auto const& chan : *hvch)
       if (max < chan.channel)
         max = chan.channel;
     lut_data.resize(max + 1);
     for (auto const& chan : *hvch) {
-      /* for (int i = 0; i < hvch->size(); i++) { */
-      /* assert(i == (*hvch)[i].channel); */
       o2::ft0::Topo topo = chan.pm;
-      std::cout << int(chan.channel) << " " << topo.mPM << " mcp " << topo.mMCP << std::endl;
       lut_data[chan.channel] = topo;
     }
     return o2::ft0::LookUpTable{lut_data};

Detectors/FIT/FT0/base/include/FT0Base/Geometry.h

@@ -16,7 +16,6 @@
 
 #include <Rtypes.h>
 #include <TVector3.h>
-#include <vector>
 
 namespace o2
 {
@@ -38,6 +37,7 @@ class Geometry
   ///
   TVector3 centerMCP(int imcp) { return mMCP[imcp]; }
 
+  static constexpr int Nchannels = 208;       // number od channels
   static constexpr int NCellsA = 24;          // number of radiatiors on A side
   static constexpr int NCellsC = 28;          // number of radiatiors on C side
   static constexpr float ZdetA = 335;         // number of radiatiors on A side

Detectors/FIT/FT0/simulation/include/FT0Simulation/Detector.h

@@ -154,7 +154,7 @@ class Detector : public o2::base::DetImpl<Detector>
   int mTrackIdTop;
   int mTrackIdMCPtop; //TEMPORARY
 
-  int mSim2LUT[208];
+  int mSim2LUT[Geometry::Nchannels];
 
   ClassDefOverride(Detector, 3);
 };

Detectors/FIT/FT0/simulation/src/Detector.cxx

@@ -211,14 +211,6 @@ void Detector::ConstructGeometry()
     TGeoHMatrix* ph = new TGeoHMatrix(hm);
     stlinC->AddNode(ins, itr, ph);
   }
-  for (int ic = 0; ic < 28; ic++) {
-    std::cout << xc2[ic] << ", ";
-  }
-  std::cout << std::endl;
-  for (int ic = 0; ic < 28; ic++) {
-    std::cout << yc2[ic] << ", ";
-  }
-  std::cout << std::endl;
   TGeoVolume* alice = gGeoManager->GetVolume("barrel");
   alice->AddNode(stlinA, 1, new TGeoTranslation(0, 30., zdetA));
   TGeoRotation* rotC = new TGeoRotation("rotC", 90., 0., 90., 90., 180., 0.);
@@ -669,7 +661,7 @@ void Detector::DefineSim2LUTindex()
     LOG(ERROR) << "Error opening ascii file (it is probably a folder!): " << indPath.c_str();
   }
   int fromfile;
-  for (int iind = 0; iind < 208; iind++) {
+  for (int iind = 0; iind < Geometry::Nchannels; iind++) {
     infile >> fromfile;
     mSim2LUT[iind] = fromfile;
   }

Detectors/FIT/FT0/simulation/src/Digits2Raw.cxx

@@ -95,7 +95,6 @@ void Digits2Raw::readDigits(const std::string& outDir, const std::string& fileDi
   */
   o2::ft0::LookUpTable lut{o2::ft0::LookUpTable::readTable()};
   LOG(INFO) << " ##### LookUp set ";
-  //  lut.printFullMap();
 
   std::string outd = outDir;
   if (outd.back() != '/') {
@@ -131,7 +130,7 @@ void Digits2Raw::readDigits(const std::string& outDir, const std::string& fileDi
     digTree->GetEntry(ient);
 
     int nbc = digitsBC.size();
-    LOG(INFO) << "Entry " << ient << " : " << nbc << " BCs stored";
+    LOG(DEBUG) << "Entry " << ient << " : " << nbc << " BCs stored";
     for (int ibc = 0; ibc < nbc; ibc++) {
       auto& bcd = digitsBC[ibc];
       intRecord = bcd.getIntRecord();
@@ -158,7 +157,7 @@ void Digits2Raw::convertDigits(o2::ft0::Digit bcdigits,
     if (nlink != oldlink) {
       if (oldlink >= 0) {
         uint nGBTWords = uint((nchannels + 1) / 2);
-        LOG(INFO) << " oldlink " << oldlink << " nGBTWords " << nGBTWords;
+        LOG(DEBUG) << " oldlink " << oldlink << " nGBTWords " << nGBTWords;
         if ((nchannels % 2) == 1) {
           mRawEventData.mEventData[nchannels] = {};
         }
@@ -171,15 +170,15 @@ void Digits2Raw::convertDigits(o2::ft0::Digit bcdigits,
       oldlink = nlink;
       mRawEventData.mEventHeader = makeGBTHeader(nlink, intRecord);
       nchannels = 0;
-      LOG(INFO) << " switch to new link " << nlink;
+      LOG(DEBUG) << " switch to new link " << nlink;
     }
     auto& newData = mRawEventData.mEventData[nchannels];
     bool isAside = (pmchannels[ich].ChId < 96);
     newData.charge = pmchannels[ich].QTCAmpl;
     newData.time = pmchannels[ich].CFDTime;
     newData.generateFlags();
     newData.channelID = lut.getMCP(pmchannels[ich].ChId);
-    LOG(INFO) << "packed GBT " << nlink << " channelID   " << (int)newData.channelID << " charge " << newData.charge << " time " << newData.time << " chain " << int(newData.numberADC) << " size " << sizeof(newData);
+    LOG(DEBUG) << "packed GBT " << nlink << " channelID   " << (int)newData.channelID << " charge " << newData.charge << " time " << newData.time << " chain " << int(newData.numberADC) << " size " << sizeof(newData);
     nchannels++;
   }
   // fill mEventData[nchannels] with 0s to flag that this is a dummy data
@@ -192,7 +191,7 @@ void Digits2Raw::convertDigits(o2::ft0::Digit bcdigits,
   mLinkID = uint32_t(oldlink);
   mFeeID = uint64_t(oldlink);
   mWriter.addData(mFeeID, mCruID, mLinkID, mEndPointID, intRecord, datalast);
-  LOG(INFO) << " last " << oldlink;
+  LOG(DEBUG) << " last " << oldlink;
   //TCM
   mRawEventData.mEventHeader = makeGBTHeader(LinkTCM, intRecord); //TCM
   mRawEventData.mEventHeader.nGBTWords = 1;
@@ -218,20 +217,20 @@ void Digits2Raw::convertDigits(o2::ft0::Digit bcdigits,
   tcmdata.amplC = ampC;
   tcmdata.timeA = mTriggers.timeA;
   tcmdata.timeC = mTriggers.timeC;
-  LOG(INFO) << " TCM  triggers read "
-            << " time A " << mTriggers.timeA << " time C " << mTriggers.timeC
-            << " amp A " << ampA << " amp C " << ampC
-            << " N A " << int(mTriggers.nChanA) << " N C " << int(mTriggers.nChanC)
-            << " trig "
-            << " ver " << mTriggers.getVertex() << " A " << mTriggers.getOrA() << " C " << mTriggers.getOrC();
-
-  LOG(INFO) << "TCMdata"
-            << " time A " << tcmdata.timeA << " time C " << tcmdata.timeC
-            << " amp A " << tcmdata.amplA << " amp C " << tcmdata.amplC
-            << " N A " << int(tcmdata.nChanA) << " N C " << int(tcmdata.nChanC)
-            << " trig "
-            << " ver " << tcmdata.vertex << " A " << tcmdata.orA << " C " << tcmdata.orC
-            << " size " << sizeof(tcmdata);
+  LOG(DEBUG) << " TCM  triggers read "
+             << " time A " << mTriggers.timeA << " time C " << mTriggers.timeC
+             << " amp A " << ampA << " amp C " << ampC
+             << " N A " << int(mTriggers.nChanA) << " N C " << int(mTriggers.nChanC)
+             << " trig "
+             << " ver " << mTriggers.getVertex() << " A " << mTriggers.getOrA() << " C " << mTriggers.getOrC();
+
+  LOG(DEBUG) << "TCMdata"
+             << " time A " << tcmdata.timeA << " time C " << tcmdata.timeC
+             << " amp A " << tcmdata.amplA << " amp C " << tcmdata.amplC
+             << " N A " << int(tcmdata.nChanA) << " N C " << int(tcmdata.nChanC)
+             << " trig "
+             << " ver " << tcmdata.vertex << " A " << tcmdata.orA << " C " << tcmdata.orC
+             << " size " << sizeof(tcmdata);
 
   auto data = mRawEventData.to_vector(1);
   mLinkID = uint32_t(LinkTCM);