modifying checks on validtime

Author: Niveditha Ramasubramanian

DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/NoiseMap.h

@@ -207,12 +207,12 @@ class NoiseMap
     int incre = 0;
     for (size_t i = 0; i < (int)mNoisyPixels.size(); ++i) {
       for (const auto& prev_np : prev->mNoisyPixels[i]) { // only enters this for loop if the "i" chip exists.
-	if (mNoisyPixels[i].find(prev_np.first) == mNoisyPixels[i].end()) {
-	  mNoisyPixels[i][prev_np.first] = prev_np.second;
-	  incre++;
-	}
+        if (mNoisyPixels[i].find(prev_np.first) == mNoisyPixels[i].end()) {
+          mNoisyPixels[i][prev_np.first] = prev_np.second;
+          incre++;
+        }
       } // end of for loop on elements of previous noise map
-    }   // end of for loop on i (chip ID)
+    } // end of for loop on i (chip ID)
     return (mNoisyPixels);
   } // end of void merge
 

Detectors/ITSMFT/MFT/calibration/src/NoiseCalibratorSpec.cxx

@@ -300,13 +300,12 @@ void NoiseCalibratorSpec::sendOutputCcdbMerge(DataAllocator& output)
   auto* payloadPrev1 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, -1, &headers);
   long validtime = std::stol(headers["Valid-From"]);
   auto mergedPL = payload;
-  if(validtime>0)
-    {
-      validtime = validtime - 1;
-      auto* payloadPrev2 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, validtime, &headers);
-      auto bufferPL = payloadPrev2->merge(payloadPrev1);
-      mergedPL = payload.merge(&bufferPL);
-    }
+  if (validtime > 0) {
+    validtime = validtime - 60;
+    auto* payloadPrev2 = api.retrieveFromTFileAny<o2::itsmft::NoiseMap>(mPath, filter, validtime, &headers);
+    auto bufferPL = payloadPrev2->merge(payloadPrev1);
+    mergedPL = payload.merge(&bufferPL);
+  }
   o2::ccdb::CcdbObjectInfo info(mPathMerge, "NoiseMap", "noise.root", meta, tstart, tend);
   auto flName = o2::ccdb::CcdbApi::generateFileName("noise");
   auto image = o2::ccdb::CcdbApi::createObjectImage(&mergedPL, &info);