Fix timestamp and trig digits

Author: Dmitri Peresunko

Common/TableProducer/caloClusterProducer.cxx

@@ -100,7 +100,7 @@ struct caloClusterProducerTask {
 
     int64_t timestamp = 0;
     if (bcs.begin() != bcs.end()) {
-      bcs.begin().timestamp(); // timestamp for CCDB object retrieval
+      timestamp = bcs.begin().timestamp(); // timestamp for CCDB object retrieval
     }
     std::map<int64_t, int> bcMap;
     int bcId = 0;
@@ -166,6 +166,10 @@ struct caloClusterProducerTask {
     for (auto& c : cells) {
       if (c.caloType() != kPHOS) // PHOS
         continue;
+      // Fix for bug in trigger digits
+      if ((c.cellType() == phos::TRU2x2 || c.cellType() == phos::TRU4x4) && c.cellNumber() == 0) {
+        continue;
+      }
       if (phosCellTRs.size() == 0) { // first cell, first TrigRec
         ir.setFromLong(c.bc_as<aod::BCsWithTimestamps>().globalBC());
         phosCellTRs.emplace_back(ir, 0, 0); // BC,first cell, ncells
@@ -177,7 +181,8 @@ struct caloClusterProducerTask {
         ir.setFromLong(c.bc_as<aod::BCsWithTimestamps>().globalBC());
         phosCellTRs.emplace_back(ir, phosCells.size(), 0);
       }
-      phosCells.emplace_back(c.cellNumber(), c.amplitude(), c.time(),
+      short absId = c.cellNumber();
+      phosCells.emplace_back(absId, c.amplitude(), c.time(),
                              static_cast<o2::phos::ChannelType_t>(c.cellType()));
       // TODO process MC info
     }
@@ -398,7 +403,7 @@ struct caloClusterProducerTask {
 
     int64_t timestamp = 0;
     if (bcs.begin() != bcs.end()) {
-      bcs.begin().timestamp(); // timestamp for CCDB object retrieval
+      timestamp = bcs.begin().timestamp(); // timestamp for CCDB object retrieval
     }
     std::map<int64_t, int> bcMap;
     int bcId = 0;
@@ -463,6 +468,10 @@ struct caloClusterProducerTask {
     for (auto& c : cells) {
       if (c.caloType() != kPHOS) // PHOS
         continue;
+      // Fix for bug in trigger digits
+      if ((c.cellType() == phos::TRU2x2 || c.cellType() == phos::TRU4x4) && c.cellNumber() == 0) {
+        continue;
+      }
       if (phosCellTRs.size() == 0) { // first cell, first TrigRec
         ir.setFromLong(c.bc_as<aod::BCsWithTimestamps>().globalBC());
         phosCellTRs.emplace_back(ir, 0, 0); // BC,first cell, ncells