TRD: comments clean up

Author: leo-barreto

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

@@ -63,7 +63,6 @@ class DCSProcessor
   bool updateVoltagesDPsCCDB();
   bool updateCurrentsDPsCCDB();
   bool updateEnvDPsCCDB();
-  // LB: new DPs for Fed
   bool updateFedChamberStatusDPsCCDB();
   bool updateFedCFGtagDPsCCDB();
 
@@ -91,7 +90,7 @@ class DCSProcessor
   CcdbObjectInfo& getccdbEnvDPsInfo() { return mCcdbEnvDPsInfo; }
   CcdbObjectInfo& getccdbFedChamberStatusDPsInfo() { return mCcdbFedChamberStatusDPsInfo; }
   CcdbObjectInfo& getccdbFedCFGtagDPsInfo() { return mCcdbFedCFGtagDPsInfo; }
-  
+
   const std::unordered_map<DPID, TRDDCSMinMaxMeanInfo>& getTRDGasDPsInfo() const { return mTRDDCSGas; }
   const std::unordered_map<DPID, float>& getTRDVoltagesDPsInfo() const { return mTRDDCSVoltages; }
   const std::unordered_map<DPID, TRDDCSMinMaxMeanInfo>& getTRDCurrentsDPsInfo() const { return mTRDDCSCurrents; }
@@ -112,7 +111,6 @@ class DCSProcessor
   void clearCurrentsDPsInfo();
   void clearEnvDPsInfo();
   void clearRunDPsInfo();
-  // LB: new DPs for Fed
   void clearFedChamberStatusDPsInfo();
   void clearFedCFGtagDPsInfo();
 
@@ -125,7 +123,6 @@ class DCSProcessor
   std::unordered_map<DPID, TRDDCSMinMaxMeanInfo> mTRDDCSCurrents; ///< anode and drift currents
   std::unordered_map<DPID, float> mTRDDCSVoltages;                ///< anode and drift voltages
   std::unordered_map<DPID, TRDDCSMinMaxMeanInfo> mTRDDCSEnv;      ///< environment parameters (temperatures, pressures, humidity)
-  // LB: new DPs for Fed
   std::array<int, constants::MAXCHAMBER> mTRDDCSFedChamberStatus; ///< fed chamber status
   std::array<string, constants::MAXCHAMBER> mTRDDCSFedCFGtag;     ///< fed config tag
 
@@ -136,23 +133,20 @@ class DCSProcessor
   CcdbObjectInfo mCcdbVoltagesDPsInfo;
   CcdbObjectInfo mCcdbCurrentsDPsInfo;
   CcdbObjectInfo mCcdbEnvDPsInfo;
-  // LB: new DPs for Fed
   CcdbObjectInfo mCcdbFedChamberStatusDPsInfo;
   CcdbObjectInfo mCcdbFedCFGtagDPsInfo;
 
   TFType mGasStartTS;      ///< the time stamp of the first TF which was processesd for the current GAS CCDB object
   TFType mVoltagesStartTS; ///< the time stamp of the first TF which was processesd for the current voltages CCDB object
   TFType mCurrentsStartTS; ///< the time stamp of the first TF which was processesd for the current voltages CCDB object
   TFType mEnvStartTS;
-  // LB: new DPs for Fed
   TFType mFedChamberStatusStartTS;
   TFType mFedCFGtagStartTS;
   TFType mCurrentTS{0}; ///< the time stamp of the TF currently being processed
   bool mGasStartTSset{false};
   bool mVoltagesStartTSSet{false};
   bool mCurrentsStartTSSet{false};
   bool mEnvStartTSSet{false};
-  // LB: new DPs for Fed
   bool mFedChamberStatusStartTSSet{false};
   bool mFedCFGtagStartTSSet{false};
   std::bitset<constants::MAXCHAMBER> mVoltageSet{};
@@ -165,8 +159,6 @@ class DCSProcessor
   int mCurrentRunNumber{-1};
   int mFedChamberStatusAlarmCounter{0};
   int mFedCFGtagAlarmCounter{0};
-  // LB: for testing runNo object, turned off for now
-  // int mFinishedRunNumber;
 
   // settings
   int mVerbosity{0};

Detectors/TRD/calibration/src/DCSProcessor.cxx

@@ -197,8 +197,10 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
     }
 
     if (type == DPVAL_INT) {
+
+      // check if DP is run number, only used for Chamber Status/CFGtag metadata
       if (std::strstr(dpid.get_alias(), "trd_fed_runNo") != nullptr) { // DP is trd_fed_runNo
-        // LB: Check if new value is a valid run number (0 = cleared variable)
+        // LB: Check if new value is a valid run number (0 = cleared variable, -1 = start variable)
         if (o2::dcs::getValue<int32_t>(dpcom) > 0) {
           // If value has changed from previous one, new run has begun and update
           if (o2::dcs::getValue<int32_t>(dpcom) != mCurrentRunNumber) {
@@ -219,13 +221,14 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
           LOG(info) << "Current Run Number: " << mCurrentRunNumber;
         }
 
-      } else if (std::strstr(dpid.get_alias(), "trd_chamberStatus") != nullptr) { // DP is trd_chamberStatus
+        // check if DP is Chamber Status
+      } else if (std::strstr(dpid.get_alias(), "trd_chamberStatus") != nullptr) {
         if (!mFedChamberStatusStartTSSet) {
           mFedChamberStatusStartTS = mCurrentTS;
           mFedChamberStatusStartTSSet = true;
         }
 
-        // LB: for ChamberStatus, grab the chamber number from alias
+        // LB: grab the chamber number from alias
         int chamberId = getChamberIdFromAlias(dpid.get_alias());
         auto& dpInfoFedChamberStatus = mTRDDCSFedChamberStatus[chamberId];
         if (etime != mLastDPTimeStamps[dpid]) {
@@ -250,7 +253,9 @@ int DCSProcessor::processDP(const DPCOM& dpcom)
     }
 
     if (type == DPVAL_STRING) {
-      if (std::strstr(dpid.get_alias(), "trd_CFGtag") != nullptr) { // DP is trd_CFGtag
+
+      // check if DP is chamber configuration tag
+      if (std::strstr(dpid.get_alias(), "trd_CFGtag") != nullptr) {
         if (!mFedCFGtagStartTSSet) {
           mFedCFGtagStartTS = mCurrentTS;
           mFedCFGtagStartTSSet = true;

Detectors/TRD/calibration/workflow/TRDDCSDataProcessorSpec.h

@@ -155,7 +155,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     mTimerVoltages = mTimerGas;
     mTimerCurrents = mTimerGas;
     mTimerEnv = mTimerGas;
-    // LB: new DPs for Fed
     mTimerFedChamberStatus = mTimerGas;
     mTimerFedCFGtag = mTimerGas;
 
@@ -201,15 +200,14 @@ class TRDDCSDataProcessor : public o2::framework::Task
       mTimerEnv = timeNow;
     }
 
-    // LB: processing logic for FedChamberStatus and FedCFGtag
     if (mProcessor->shouldUpdateFedChamberStatus()) {
       sendDPsoutputFedChamberStatus(pc.outputs());
     }
 
     if (mProcessor->shouldUpdateFedCFGtag()) {
       sendDPsoutputFedCFGtag(pc.outputs());
     }
-    
+
     sw.Stop();
 
     if (mReportTiming) {
@@ -223,7 +221,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     sendDPsoutputVoltages(ec.outputs());
     sendDPsoutputCurrents(ec.outputs());
     sendDPsoutputEnv(ec.outputs());
-    // LB: new DPs for Fed
     sendDPsoutputFedChamberStatus(ec.outputs());
     sendDPsoutputFedCFGtag(ec.outputs());
   }
@@ -235,7 +232,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
   std::chrono::high_resolution_clock::time_point mTimerVoltages;
   std::chrono::high_resolution_clock::time_point mTimerCurrents;
   std::chrono::high_resolution_clock::time_point mTimerEnv;
-  // LB: new DPs for Fed
   std::chrono::high_resolution_clock::time_point mTimerFedChamberStatus;
   std::chrono::high_resolution_clock::time_point mTimerFedCFGtag;
 
@@ -244,7 +240,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
   int64_t mCurrentsDPsUpdateInterval;
   int64_t mMinUpdateIntervalU;
   int64_t mEnvDPsUpdateInterval;
-  // LB: new DPs for Fed
   int64_t mFedChamberStatusDPsUpdateInterval;
   int64_t mFedCFGtagDPsUpdateInterval;
 
@@ -322,7 +317,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     }
   }
 
-  // LB: new DP for FedChamberStatus
   //________________________________________________________________
   void sendDPsoutputFedChamberStatus(DataAllocator& output)
   {
@@ -342,7 +336,6 @@ class TRDDCSDataProcessor : public o2::framework::Task
     }
   }
 
-  // LB: new DP for FedCFGtag
   //________________________________________________________________
   void sendDPsoutputFedCFGtag(DataAllocator& output)
   {
@@ -372,7 +365,6 @@ DataProcessorSpec getTRDDCSDataProcessorSpec()
 {
 
   std::vector<OutputSpec> outputs;
-   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_ChamberStat"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSGasDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_DCSGasDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSUDPs"});
@@ -383,7 +375,6 @@ DataProcessorSpec getTRDDCSDataProcessorSpec()
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_DCSRunDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_DCSEnvDPs"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_DCSEnvDPs"});
-  // LB: new DPs for Fed
   // Must use reduced names due to initializer string cannot exceed descriptor size in Data Format
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TRD_ChamberStat"});
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TRD_ChamberStat"});