testingstuff

Author: bazinski

DataFormats/Detectors/TRD/include/DataFormatsTRD/TrapRegisters.h

@@ -72,7 +72,7 @@ class TrapRegisters
     kCTGCTRL, kMEMRW, kMEMCOR, kDMDELA, kDMDELS, kNMOD, kNDLY, kNED, kNTRO, kNRRO, kNBND, kNP0, kNP1,
     kNP2, kNP3, kC08CPU0, kQ2VINFO /*C09CPU0  will be q2 pid window settings, and partial version info.*/,
     kC10CPU0, kC11CPU0, kC12CPUA, kC13CPUA, kC14CPUA, kC15CPUA, kC08CPU1, kVINFO/*kC09CPU1  version of trap code.*/,
-    kC10CPU1, kC11CPU1, kC08CPU2, kNDRIFT /*kC09CPU2*/, kC10CPU2, kC11CPU2, kC08CPU3, kYCORR /*kC09CPU3*/,
+    kC10CPU1, kC11CPU1, kC08CPU2, kNTIMEBINS /*kC09CPU2*/, kC10CPU2, kC11CPU2, kC08CPU3, kYCORR /*kC09CPU3*/,
     kC10CPU3, kC11CPU3, kNES, kNTP, kNCUT, kPASACHM, kLastReg
   };
   // clang-format on

DataFormats/Detectors/TRD/src/MCMEvent.cxx

@@ -37,24 +37,16 @@ const uint32_t MCMEvent::getRegister(const uint32_t regidx, const TrapRegInfo& t
 bool MCMEvent::setRegister(const uint32_t data, const uint32_t regidx, const TrapRegInfo& trapreg)
 {
   uint32_t regvalue = data;
-  LOGP(info,"setRegister ( {}, {}, trapreg",data,regidx);
-  LOGP(info,"base : {} datawordnumber : {} ", trapreg.getBase(), trapreg.getDataWordNumber());
+//  LOGP(info,"setRegister ( {}, {}, trapreg",data,regidx);
+ // LOGP(info,"base : {} datawordnumber : {} ", trapreg.getBase(), trapreg.getDataWordNumber());
   int regoffset = trapreg.getBase() + trapreg.getDataWordNumber(); // wordnumber; // get the offset to the register in question
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   regvalue &= trapreg.getMask();                                   // mask the data off as need be.
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   uint32_t notdatamask = ~(trapreg.getMask() << trapreg.getShift());
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   regvalue = regvalue << trapreg.getShift();
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
-  LOGP(info,"regoffset : {} ", regoffset);
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
+  //LOGP(info,"regoffset : {} ", regoffset);
   auto trapregvalue = mRegisterData[regoffset];
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   mRegisterData[regoffset] = mRegisterData[regoffset] & notdatamask;
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   mRegisterData[regoffset] = mRegisterData[regoffset] | regvalue;
-  LOGP(info,"{} : {} : {}",__LINE__, __func__, __FILE__);
   return true;
 }
 

DataFormats/Detectors/TRD/src/TrapConfigEvent.cxx

@@ -50,12 +50,14 @@ uint32_t TrapConfigEvent::getRegisterValue(const uint32_t regidx, const int mcmi
   // find register in mTrapRegisters.
   // calculate the offset from the base for the register and get the mask.
 
+//  LOGP(info, "get reg value : for regidx : {} for mcm : {} one or other is out of bounds of [0,{}] and [0,{}] respectively", (int)regidx, (int)mcmidx, (int)TrapRegisters::kLastReg, (int)constants::MAXMCMCOUNT);
   if ((regidx < 0) || (regidx >= TrapRegisters::kLastReg) || (mcmidx < 0 || mcmidx >= o2::trd::constants::MAXMCMCOUNT)) {
     LOGP(warning, "get reg value : for regidx : {} for mcm : {} one or other is out of bounds of [0,{}] and [0,{}] respectively", (int)regidx, (int)mcmidx, (int)TrapRegisters::kLastReg, (int)constants::MAXMCMCOUNT);
     return 0; // TODO this could be a problem ?!
   }
   int regbase = mTrapRegisters[regidx].getBase();                       // get the base of this register in the underlying storage block
   int regoffset = regbase + mTrapRegisters[regidx].getDataWordNumber(); // get the offset to the register in question
+ // LOGP(info, "configdata index : {} for mcm {} mConfigData size : {} ",mConfigDataIndex[mcmidx],mcmidx, mConfigData.size());
 
   uint32_t data = mConfigData[mConfigDataIndex[mcmidx]].getRegister(regidx, mTrapRegisters[regidx]);
   return data;

DataFormats/Detectors/TRD/src/TrapRegisters.cxx

@@ -461,7 +461,7 @@ void TrapRegisters::initialiseRegisters()
   mTrapRegisters[kC10CPU1].init("C10CPU1", 0x0C0A, 32, 136, 0, true, 32);
   mTrapRegisters[kC11CPU1].init("C11CPU1", 0x0C0B, 32, 137, 0, true, 32);
   mTrapRegisters[kC08CPU2].init("C08CPU2", 0x0C10, 32, 138, 0, true, 32);
-  mTrapRegisters[kNDRIFT].init("NDRIFT", 0x0C11, 32, 139, 0, false, 32); // was called C09CPU2
+  mTrapRegisters[kNTIMEBINS].init("NTIMEBINS", 0x0C11, 32, 139, 0, false, 32); // was called C09CPU2
   mTrapRegisters[kC10CPU2].init("C10CPU2", 0x0C12, 32, 140, 0, true, 32);
   mTrapRegisters[kC11CPU2].init("C11CPU2", 0x0C13, 32, 141, 0, true, 32);
   mTrapRegisters[kC08CPU3].init("C08CPU3", 0x0C18, 32, 142, 0, true, 32);

Detectors/TRD/calibration/include/TRDCalibration/CalibratorConfigEvents.h

@@ -57,7 +57,7 @@ class CalibratorConfigEvents
   bool timeLimitReached()
   {
     mTimeLimitCount++;
-    if (mTimeLimitCount > 10) {
+    if (mTimeLimitCount > 50) {
       mTimeLimitCount = 0;
       return true;
     } else

Detectors/TRD/calibration/src/CalibratorConfigEvents.cxx

@@ -160,6 +160,7 @@ void CalibratorConfigEvents::collapseRegisterValues()
   // map to store unique values for each register to infer mo
   std::array<std::map<uint32_t, uint32_t>, TrapRegisters::kLastReg> registersvaluemap;
   // Collapse the frequency maps of registers into singular values
+  int32_t presentcount=0;
   for (uint32_t mcmid = 0; mcmid < constants::MAXMCMCOUNT; ++mcmid) {
 
     if (mCCDBObject.isMCMPresent(mcmid)) {
@@ -196,8 +197,9 @@ void CalibratorConfigEvents::collapseRegisterValues()
           }
         }
       }
+    presentcount++;
     } else {
-      LOGP(info, "Collapsing with mcmid {} is not present", mcmid);
+      LOGP(debug, "Collapsing with mcmid {} is not present", mcmid);
     }
   }
 

Detectors/TRD/qc/include/TRDQC/RawDisplay.h

@@ -38,6 +38,7 @@ class RawDisplay
   void drawSimTracklets();
   void drawCalibratedTracklets();
   void drawClusters();
+  void drawSimHits();
   void drawHits();
   void drawMCTrackSegments();
 
@@ -58,6 +59,20 @@ class RawDisplay
   float mCalvdriftexb{};
   //  TrackletTransformer mTransformer;
   float mClusterThreshold{50}; /// threshold for drawing clusters
+  // Sort functions as in TRAP
+  void sort2(uint16_t idx1i, uint16_t idx2i, uint16_t val1i, uint16_t val2i,
+             uint16_t* idx1o, uint16_t* idx2o, uint16_t* val1o, uint16_t* val2o) const;
+  void sort3(uint16_t idx1i, uint16_t idx2i, uint16_t idx3i,
+             uint16_t val1i, uint16_t val2i, uint16_t val3i,
+             uint16_t* idx1o, uint16_t* idx2o, uint16_t* idx3o,
+             uint16_t* val1o, uint16_t* val2o, uint16_t* val3o) const;
+  void sort6To4(uint16_t idx1i, uint16_t idx2i, uint16_t idx3i, uint16_t idx4i, uint16_t idx5i, uint16_t idx6i,
+                uint16_t val1i, uint16_t val2i, uint16_t val3i, uint16_t val4i, uint16_t val5i, uint16_t val6i,
+                uint16_t* idx1o, uint16_t* idx2o, uint16_t* idx3o, uint16_t* idx4o,
+                uint16_t* val1o, uint16_t* val2o, uint16_t* val3o, uint16_t* val4o) const;
+  void sort6To2Worst(uint16_t idx1i, uint16_t idx2i, uint16_t idx3i, uint16_t idx4i, uint16_t idx5i, uint16_t idx6i,
+                     uint16_t val1i, uint16_t val2i, uint16_t val3i, uint16_t val4i, uint16_t val5i, uint16_t val6i,
+                     uint16_t* idx5o, uint16_t* idx6o) const;
 };
 
 /// The MCM display is a raw display specialized to display data for a single MCM