[IMPORTANT] Fix ITS fee (and fhr) task (#1690)

* added option to normalize angular distributions by nROF + added 6 new plots for experts

* removed channel G:FLP/DISTSUBTIMEFRAME/0 from FEE and FHR task

Author: iravasen

Modules/ITS/include/ITS/ITSFhrTask.h

@@ -100,7 +100,6 @@ class ITSFhrTask final : public TaskInterface
   ChipPixelData* mChipDataBuffer = nullptr;
   std::vector<ChipPixelData> mChipsBuffer;
   int mHitNumberOfChip[7][48][2][14][14] = { { { { { 0 } } } } }; // layer, stave, substave, hic, chip
-  unsigned int mTimeFrameId = 0;
 
   int mNTrigger = 13;
   unsigned int mErrors[19] = { 0 };
@@ -145,7 +144,6 @@ class ITSFhrTask final : public TaskInterface
   float etabinsOB6[49 + 1] = { -1.369600, -1.332400, -1.293960, -1.254200, -1.213050, -1.170430, -1.126260, -1.080380, -1.032840, -0.983488, -0.932225, -0.878966, -0.823626, -0.766135, -0.706331, -0.644375, -0.580163, -0.513723, -0.445132, -0.374519, -0.302079, -0.227946, -0.152690, -0.076567, 0.000000, 0.076567, 0.152690, 0.227946, 0.302079, 0.374519, 0.445132, 0.513723, 0.580163, 0.644375, 0.706331, 0.766135, 0.823626, 0.878966, 0.932225, 0.983488, 1.032840, 1.080380, 1.126260, 1.170430, 1.213050, 1.254200, 1.293960, 1.332400, 1.369600, 1.4 };
 
   // General plots
-  TH1F* mTFInfo; // count vs TF ID
   TH1D* mErrorPlots;
   TH2I* mErrorVsFeeid;
   TH2Poly* mGeneralOccupancy;  // Max Occuapncy(chip/hic) in one stave

Modules/ITS/itsFee.json

@@ -3,7 +3,7 @@
         "config": {
             "database": {
                 "implementation": "CCDB",
-                "host": "188.184.2.55:8080",
+                "host": "ccdb-test.cern.ch:8080",
                 "username": "not_applicable",
                 "password": "not_applicable",
                 "name": "not_applicable"
@@ -19,7 +19,7 @@
                 "url": ""
             },
             "conditionDB": {
-                "url": "188.184.2.55:8080"
+                "url": "ccdb-test.cern.ch:8080"
             }
         },
         "tasks": {
@@ -32,7 +32,7 @@
                 "maxNumberCycles": "-1",
                 "dataSource": {
                     "type": "direct",
-                    "query": "filter:ITS/RAWDATA;G:FLP/DISTSUBTIMEFRAME/0"
+                    "query": "filter:ITS/RAWDATA"
                 },
                 "location": "local",
                 "taskParameters": {
@@ -77,21 +77,5 @@
                 ]
             }
         }
-    },
-    "dataSamplingPolicies": [
-        {
-            "id": "RAWDATA",
-            "active": "true",
-            "machines": [],
-            "query": "filter:ITS/RAWDATA;G:FLP/DISTSUBTIMEFRAME/0",
-            "samplingConditions": [
-                {
-                    "condition": "random",
-                    "fraction": "1",
-                    "seed": "1441"
-                }
-            ],
-            "blocking": "false"
-        }
-    ]
+    }
 }

Modules/ITS/itsFhr.json

@@ -37,8 +37,7 @@
                 "location": "remote",
                 "taskParameters": {
                     "Layer": "3",
-		    "HitNumberCut": "0",
-                    "GetTFFromBinding": "0",
+		    "HitNumberCut": "0", 
                     "decoderThreads": "8",
                     "HitNumberCutForNoisyPixel": "0",
                     "OccupancyNumberCutForNoisyPixel": "0.000001",
@@ -84,7 +83,7 @@
             "id": "RAWDATA",
             "active": "true",
             "machines": [],
-            "query": "filter:ITS/RAWDATA;G:FLP/DISTSUBTIMEFRAME/0",
+            "query": "filter:ITS/RAWDATA",
             "samplingConditions": [
                 {
                     "condition": "random",

Modules/ITS/src/ITSFeeTask.cxx

@@ -321,10 +321,7 @@ void ITSFeeTask::monitorData(o2::framework::ProcessingContext& ctx)
   int nStops[NFees] = {};
   int payloadTot[NFees] = {};
 
-  std::vector<InputSpec> rawDataFilter{ InputSpec{ "", ConcreteDataTypeMatcher{ "DS", "RAWDATA0" }, Lifetime::Timeframe } };
-
-  rawDataFilter.push_back(InputSpec{ "", ConcreteDataTypeMatcher{ "ITS", "RAWDATA" }, Lifetime::Timeframe });
-  DPLRawParser parser(ctx.inputs(), rawDataFilter);
+  DPLRawParser parser(ctx.inputs());
 
   resetLanePlotsAndCounters(); // action taken depending on mResetLaneStatus and mResetPayload
 
@@ -366,8 +363,8 @@ void ITSFeeTask::monitorData(o2::framework::ProcessingContext& ctx)
     if ((int)(o2::raw::RDHUtils::getStop(rdh)) && it.size()) { // looking into the DDW0 from the closing packet
       auto const* ddw = reinterpret_cast<const GBTDiagnosticWord*>(it.data());
       uint64_t laneInfo = ddw->laneWord.laneBits.laneStatus;
-      uint8_t flag1 = ddw->indexWord.indexBits.flag1;
 
+      uint8_t flag1 = ddw->indexWord.indexBits.flag1;
       for (int i = 0; i < 3; i++) {
         if (flag1 >> i & 0x1) {
           mFlag1Check->Fill(ifee, i);
@@ -467,7 +464,7 @@ void ITSFeeTask::monitorData(o2::framework::ProcessingContext& ctx)
     }
   }
 
-  mTimeFrameId = ctx.inputs().get<int>("G");
+  mTimeFrameId++;
 
   mTFInfo->Fill(mTimeFrameId);
   end = std::chrono::high_resolution_clock::now();

Modules/ITS/src/ITSFhrTask.cxx

@@ -47,7 +47,6 @@ ITSFhrTask::~ITSFhrTask()
   delete mGeneralNoisyPixel;
   delete mDecoder;
   delete mChipDataBuffer;
-  delete mTFInfo;
   delete mErrorPlots;
   delete mErrorVsFeeid;
   delete mChipStaveOccupancy;
@@ -270,9 +269,6 @@ void ITSFhrTask::createGeneralPlots()
 
   createErrorTriggerPlots();
 
-  mTFInfo = new TH1F("General/TFInfo", "TF vs count", 15000, 0, 15000);
-  getObjectsManager()->startPublishing(mTFInfo); // mTFInfo
-
   mErrorVsFeeid = new TH2I("General/ErrorVsFeeid", "Error count vs Error id and Fee id", (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), 0, (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
   mErrorVsFeeid->SetMinimum(0);
   mErrorVsFeeid->SetStats(0);
@@ -371,9 +367,6 @@ void ITSFhrTask::setPlotsFormat()
   if (mErrorPlots) {
     setAxisTitle(mErrorPlots, "Error ID", "Counts");
   }
-  if (mTFInfo) {
-    setAxisTitle(mTFInfo, "TF ID", "Counts");
-  }
   if (mErrorVsFeeid) {
     setAxisTitle(mErrorVsFeeid, "FeeID", "Error ID");
   }
@@ -426,17 +419,6 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
   std::chrono::time_point<std::chrono::high_resolution_clock> end;
   int difference;
   start = std::chrono::high_resolution_clock::now();
-  // get TF id by dataorigin and datadescription
-  const InputSpec TFIdFilter{ "", ConcreteDataTypeMatcher{ "DS", "RAWDATA1" }, Lifetime::Timeframe }; // after Data Sampling the dataorigin will become to "DS" and the datadescription will become  to "RAWDATAX"
-  if (!mGetTFFromBinding) {
-    for (auto& input : ctx.inputs()) {
-      if (DataRefUtils::match(input, TFIdFilter)) {
-        mTimeFrameId = (unsigned int)*input.payload;
-      }
-    }
-  } else {
-    mTimeFrameId = ctx.inputs().get<int>("G");
-  }
 
   // set Decoder
   mDecoder->startNewTF(ctx.inputs());
@@ -750,11 +732,6 @@ void ITSFhrTask::monitorData(o2::framework::ProcessingContext& ctx)
   }
   delete[] occupancyPlotTmp;
 
-  // temporarily reverting to get TFId by querying binding
-  //   mTimeFrameId = ctx.inputs().get<int>("G");
-  // Timer LOG
-  mTFInfo->Fill(mTimeFrameId);
-
   end = std::chrono::high_resolution_clock::now();
   difference = std::chrono::duration_cast<std::chrono::microseconds>(end - start).count();
 
@@ -770,7 +747,6 @@ void ITSFhrTask::getParameters()
   mNThreads = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "decoderThreads", mNThreads);
   mLayer = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "Layer", mLayer);
   mHitCutForCheck = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "HitNumberCut", mHitCutForCheck);
-  mGetTFFromBinding = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "GetTFFromBinding", mGetTFFromBinding);
   mHitCutForNoisyPixel = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "HitNumberCutForNoisyPixel", mHitCutForNoisyPixel);
   mOccupancyCutForNoisyPixel = o2::quality_control_modules::common::getFromConfig<float>(mCustomParameters, "OccupancyNumberCutForNoisyPixel", mOccupancyCutForNoisyPixel);
   mMaxGeneralAxisRange = o2::quality_control_modules::common::getFromConfig<float>(mCustomParameters, "MaxGeneralAxisRange", mMaxGeneralAxisRange);
@@ -798,7 +774,6 @@ void ITSFhrTask::endOfActivity(Activity& /*activity*/)
 
 void ITSFhrTask::resetGeneralPlots()
 {
-  resetObject(mTFInfo);
   resetObject(mErrorPlots);
   resetObject(mErrorVsFeeid);
 }
@@ -807,7 +782,6 @@ void ITSFhrTask::resetOccupancyPlots()
 {
   memset(mHitNumberOfChip, 0, sizeof(mHitNumberOfChip));
   memset(mErrors, 0, sizeof(mErrors));
-  mTimeFrameId = 0;
   mChipStaveOccupancy->Reset();
   mChipStaveEventHitCheck->Reset();
   mOccupancyPlot->Reset();