ITS/FHR: new definition of noise pixel (#2503)

* new definition of noise pixel

* clang

* clang2

* clang3

* Clang 6

Author: IsakovAD

Modules/ITS/include/ITS/ITSFhrTask.h

@@ -109,14 +109,14 @@ class ITSFhrTask final : public TaskInterface
   int mDoHitmapFilter = 1;    // do filtering of noise pixel vector
   std::unordered_map<unsigned int, int>*** mHitPixelID_InStave = nullptr /* = new std::unordered_map<unsigned int, int>**[NStaves[lay]]*/;
   int** mHitnumberLane = nullptr /* = new int*[NStaves[lay]]*/; // IB : hitnumber[stave][chip]; OB : hitnumber[stave][lane]
-  double** mOccupancyLane /* = new double*[NStaves[lay]]*/; // IB : occupancy[stave][chip]; OB : occupancy[stave][Lane]
+  double** mOccupancyLane /* = new double*[NStaves[lay]]*/;     // IB : occupancy[stave][chip]; OB : occupancy[stave][Lane]
   int*** mErrorCount = nullptr /* = new int**[NStaves[lay]]*/;  // IB : errorcount[stave][FEE][errorid]
   double** mChipPhi = nullptr /* = new double*[NStaves[lay]]*/; // IB/OB : mChipPhi[Stave][chip]
   double** mChipZ = nullptr /* = new double*[NStaves[lay]]*/;   // IB/OB : mChipZ[Stave][chip]
 
   int** mChipStat = nullptr /* = new double*[NStaves[lay]]*/; // IB/OB : mChipStat[Stave][chip]
   int mNoisyPixelNumber[7][48] = { { 0 } };
-
+  unsigned long nHitsTotal = 0;
   int mMaxGeneralAxisRange = -3;  // the range of TH2Poly plots z axis range, pow(10, mMinGeneralAxisRange) ~ pow(10, mMaxGeneralAxisRange)
   int mMinGeneralAxisRange = -12; //
   int mMaxGeneralNoisyAxisRange = 4000;

Modules/ITS/itsFhr.json

@@ -37,7 +37,7 @@
                 "taskParameters": {
                     "Layer": "4",
 		    "HitNumberCut": "0", 
-                    "decoderThreads": "8",
+                    "decoderThreads": "1",
                     "HitNumberCutForNoisyPixel": "0",
                     "OccupancyNumberCutForNoisyPixel": "0.000001",
           	    "MaxGeneralAxisRange": "-2",

Modules/ITS/src/ITSFhrTask.cxx

@@ -500,6 +500,7 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
       for (auto& digit : digVec[istave][0]) {
         int chip = digit.getChipIndex() % 9;
         mHitPixelID_InStave[istave][0][chip][1000 * digit.getColumn() + digit.getRow()]++;
+        nHitsTotal++;
         if (mTFCount <= mCutTFForSparse) {
           Double_t pixelPos[2] = { 1. * (digit.getColumn() + (1024 * chip)), 1. * digit.getRow() };
           mStaveHitmap[istave]->Fill(pixelPos);
@@ -510,6 +511,7 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
         for (auto& digit : digVec[istave][ihic]) {
           int chip = ((digit.getChipIndex() - ChipBoundary[mLayer]) % (14 * nHicPerStave[mLayer])) % 14;
           mHitPixelID_InStave[istave][ihic][chip][1000 * digit.getColumn() + digit.getRow()]++;
+          nHitsTotal++;
           int ilink = ihic / (nHicPerStave[mLayer] / 2);
           if (mTFCount <= mCutTFForSparse) {
             if (chip < 7) {
@@ -536,6 +538,7 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
   }
 
   int totalhit = 0;
+
 #ifdef WITH_OPENMP
   omp_set_num_threads(mNThreads);
 #pragma omp parallel for schedule(dynamic) reduction(+ \
@@ -566,10 +569,11 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
 
           if (mDoHitmapFilter == 1) {
             for (auto iter = mHitPixelID_InStave[istave][0][ichip].begin(); iter != mHitPixelID_InStave[istave][0][ichip].end();) {
-              if ((double)iter->second / GBTLinkInfo->statistics.nTriggers < mPhysicalOccupancyIB) { // 40 hits/cm^2 * 5 pixels/hits * 4.5 cm^2 / 1024 / 512 = 1.7e-3/pixel/event for physics
+              if ((double)iter->second / 10 < (double)nHitsTotal / ((ChipBoundary[mLayer + 1] - ChipBoundary[mLayer]) * 1024 * 512)) { // noisy if more than 3x of averaged per chip
                 mHitPixelID_InStave[istave][0][ichip].erase(iter++);
-              } else
+              } else {
                 ++iter;
+              }
             }
           }
 
@@ -607,10 +611,12 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
 
               if (mDoHitmapFilter == 1) {
                 for (auto iter = mHitPixelID_InStave[istave][ihic + ilink * ((nHicPerStave[mLayer] / NSubStave[mLayer]))][ichip].begin(); iter != mHitPixelID_InStave[istave][ihic + ilink * ((nHicPerStave[mLayer] / NSubStave[mLayer]))][ichip].end();) {
-                  if ((double)iter->second / GBTLinkInfo->statistics.nTriggers < mPhysicalOccupancyOB) { // 1 hits/cm^2 * 5 pixels/hits * 4.5 cm^2 / 1024 / 512 = 4.3e-5/pixel/event`
+                  if ((double)iter->second / 100 < (double)nHitsTotal / ((ChipBoundary[mLayer + 1] - ChipBoundary[mLayer]) * 1024 * 512)) { // noisy if more than 3x of averaged per chip
                     mHitPixelID_InStave[istave][ihic + ilink * ((nHicPerStave[mLayer] / NSubStave[mLayer]))][ichip].erase(iter++);
-                  } else
+
+                  } else {
                     ++iter;
+                  }
                 }
               }
               for (auto iter = mHitPixelID_InStave[istave][ihic + ilink * ((nHicPerStave[mLayer] / NSubStave[mLayer]))][ichip].begin(); iter != mHitPixelID_InStave[istave][ihic + ilink * ((nHicPerStave[mLayer] / NSubStave[mLayer]))][ichip].end(); iter++) {