Protection from zero payload

Dmitri Peresunko · davidrohr · commit a9c25ed317dd · 2021-10-22T22:12:52.000+02:00
Skip zero energy clusters; add config params

exception handling improved
diff --git a/Detectors/PHOS/base/src/RCUTrailer.cxx b/Detectors/PHOS/base/src/RCUTrailer.cxx
@@ -44,6 +44,9 @@ void RCUTrailer::constructFromRawPayload(const gsl::span<const uint32_t> payload
 {
   reset();
   int index = payloadwords.size();
+  if (index < 1) { //
+    throw Error(Error::ErrorType_t::DECODING_INVALID, "zero payload");
+  }
   auto word = payloadwords[--index];
   if ((word >> 30) != 3) {
     throw Error(Error::ErrorType_t::DECODING_INVALID, "Last RCU trailer word not found!");
@@ -53,7 +56,7 @@ void RCUTrailer::constructFromRawPayload(const gsl::span<const uint32_t> payload
   mRCUId = (int)((word >> 7) & 0x1FF);
   int trailerSize = (word & 0x7F);
 
-  if (trailerSize < 2) {
+  if (trailerSize < 2 || trailerSize > index + 1) { //one word already read -> index is smaller
     throw Error(Error::ErrorType_t::SIZE_INVALID, fmt::format("Invalid trailer size found (%d bytes) !", trailerSize * 4).data());
   }
   mTrailerSize = trailerSize;
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibDevice.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibDevice.h
@@ -34,7 +34,8 @@ namespace phos
 class PHOSEnergyCalibDevice : public o2::framework::Task
 {
  public:
-  explicit PHOSEnergyCalibDevice(bool useCCDB, std::string path, std::string digitspath) : mUseCCDB(useCCDB), mCCDBPath(path), mdigitsfilename(digitspath) {}
+  explicit PHOSEnergyCalibDevice(bool useCCDB, std::string path, std::string digitspath,
+                                 float ptMin, float eMinHGTime, float eMinLGTime) : mUseCCDB(useCCDB), mCCDBPath(path), mdigitsfilename(digitspath), mPtMin(ptMin), mEminHGTime(eMinHGTime), mEminLGTime(eMinLGTime) {}
 
   void init(o2::framework::InitContext& ic) final;
 
@@ -43,13 +44,16 @@ class PHOSEnergyCalibDevice : public o2::framework::Task
   void endOfStream(o2::framework::EndOfStreamContext& ec) final;
 
  protected:
+  void postHistosCCDB(o2::framework::EndOfStreamContext& ec);
+
  private:
   static constexpr short kMaxCluInEvent = 64; /// maximal number of clusters per event to separate digits from them (6 bits in digit map)
   bool mUseCCDB = false;
   std::string mCCDBPath{"http://ccdb-test.cern.ch:8080"}; ///< CCDB server path
   std::string mdigitsfilename = "./CalibDigits.root";
-  long mRunStartTime = 0; /// start time of the run (sec)
-  float mPtMin = 1.5;     /// minimal energy to fill inv. mass histo
+  bool mPostHistos = true; /// post colllected histos to ccdb
+  long mRunStartTime = 0;  /// start time of the run (sec)
+  float mPtMin = 1.5;      /// minimal energy to fill inv. mass histo
   float mEminHGTime = 1.5;
   float mEminLGTime = 5.;
   std::unique_ptr<PHOSEnergyCalibrator> mCalibrator; /// Agregator of calibration TimeFrameSlots
@@ -58,7 +62,7 @@ class PHOSEnergyCalibDevice : public o2::framework::Task
   ClassDefNV(PHOSEnergyCalibDevice, 1);
 };
 
-o2::framework::DataProcessorSpec getPHOSEnergyCalibDeviceSpec(bool useCCDB, std::string path, std::string digitspath);
+o2::framework::DataProcessorSpec getPHOSEnergyCalibDeviceSpec(bool useCCDB, std::string path, std::string digitspath, float ptMin, float eMinHGTime, float eMinLGTime);
 } // namespace phos
 } // namespace o2
 
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
@@ -124,6 +124,7 @@ class PHOSEnergyCalibrator final : public o2::calibration::TimeSlotCalibration<o
 
   void endOfStream();
 
+  ETCalibHistos* getCollectedHistos() { return mHistos.get(); }
   void setOutDigitsFile(std::string& name) { mdigitsfilename = name; };
   void setCalibration(CalibParams& c) { mCalibParams.reset(new CalibParams(c)); }
   void setBadMap(BadChannelsMap& map) { mBadMap.reset(new BadChannelsMap(map)); }
@@ -146,7 +147,7 @@ class PHOSEnergyCalibrator final : public o2::calibration::TimeSlotCalibration<o
   float mEminLGTime = 5.;
   std::unique_ptr<CalibParams> mCalibParams; /// Current calibration object
   std::unique_ptr<BadChannelsMap> mBadMap;   /// Current BadMap
-  ETCalibHistos mHistos;                     /// final histograms
+  std::unique_ptr<ETCalibHistos> mHistos;    /// final histograms
   std::vector<uint32_t> mDigits;             /// list of calibration digits to fill
   std::unique_ptr<TFile> mFout;              /// file to write calib digits
 
diff --git a/Detectors/PHOS/calib/src/PHOSEnergyCalibDevice.cxx b/Detectors/PHOS/calib/src/PHOSEnergyCalibDevice.cxx
@@ -26,9 +26,6 @@ void PHOSEnergyCalibDevice::init(o2::framework::InitContext& ic)
 {
   mCalibrator.reset(new PHOSEnergyCalibrator());
 
-  //TODO!!! read configuration
-  // mPtMin,mEminHGTime,mEminLGTime
-
   //Configure output Digits file
   mCalibrator->setOutDigitsFile(mdigitsfilename);
 
@@ -74,6 +71,9 @@ void PHOSEnergyCalibDevice::run(o2::framework::ProcessingContext& pc)
   const gsl::span<const TriggerRecord>& cluTR = pc.inputs().get<gsl::span<TriggerRecord>>("clusterTriggerRecords");
 
   LOG(INFO) << "[PHOSEnergyCalibDevice - run]  Received " << clusters.size() << " clusters and " << clusters.size() << " clusters, running calibration";
+  if (mRunStartTime == 0) {
+    mRunStartTime = o2::header::get<o2::framework::DataProcessingHeader*>(pc.inputs().get("clusterTriggerRecords").header)->startTime;
+  }
 
   mCalibrator->process(tfcounter, clusters, cluelements, cluTR);
 }
@@ -83,9 +83,31 @@ void PHOSEnergyCalibDevice::endOfStream(o2::framework::EndOfStreamContext& ec)
   constexpr uint64_t INFINITE_TF = 0xffffffffffffffff;
   mCalibrator->checkSlotsToFinalize(INFINITE_TF);
   mCalibrator->endOfStream();
+  if (mPostHistos) {
+    postHistosCCDB(ec);
+  }
 }
 
-o2::framework::DataProcessorSpec o2::phos::getPHOSEnergyCalibDeviceSpec(bool useCCDB, std::string path, std::string digitspath)
+void PHOSEnergyCalibDevice::postHistosCCDB(o2::framework::EndOfStreamContext& ec)
+{
+  // prepare all info to be sent to CCDB
+  auto flName = o2::ccdb::CcdbApi::generateFileName("TimeEnHistos");
+  std::map<std::string, std::string> md;
+  o2::ccdb::CcdbObjectInfo info("PHS/Calib/TimeEnHistos", "TimeEnHistos", flName, md, mRunStartTime, 99999999999999);
+  info.setMetaData(md);
+  auto image = o2::ccdb::CcdbApi::createObjectImage(mCalibrator->getCollectedHistos(), &info);
+
+  LOG(INFO) << "Sending object " << info.getPath() << "/" << info.getFileName()
+            << " of size " << image->size()
+            << " bytes, valid for " << info.getStartValidityTimestamp()
+            << " : " << info.getEndValidityTimestamp();
+
+  header::DataHeader::SubSpecificationType subSpec{(header::DataHeader::SubSpecificationType)0};
+  ec.outputs().snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "PHOS_TEHistos", subSpec}, *image.get());
+  ec.outputs().snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "PHOS_TEHistos", subSpec}, info);
+}
+o2::framework::DataProcessorSpec o2::phos::getPHOSEnergyCalibDeviceSpec(bool useCCDB, std::string path, std::string digitspath,
+                                                                        float ptMin, float eMinHGTime, float eMinLGTime)
 {
 
   std::vector<InputSpec> inputs;
@@ -96,15 +118,15 @@ o2::framework::DataProcessorSpec o2::phos::getPHOSEnergyCalibDeviceSpec(bool use
   using clbUtils = o2::calibration::Utils;
   std::vector<OutputSpec> outputs;
   outputs.emplace_back(
-    ConcreteDataTypeMatcher{clbUtils::gDataOriginCDBPayload, "PHOS_EnCalib"});
+    ConcreteDataTypeMatcher{clbUtils::gDataOriginCDBPayload, "PHOS_TEHistos"});
   outputs.emplace_back(
-    ConcreteDataTypeMatcher{clbUtils::gDataOriginCDBWrapper, "PHOS_EnCalib"});
+    ConcreteDataTypeMatcher{clbUtils::gDataOriginCDBWrapper, "PHOS_TEHistos"});
   //stream for QC data
   //outputs.emplace_back("PHS", "TRIGGERQC", 0, o2::framework::Lifetime::Timeframe);
 
   return o2::framework::DataProcessorSpec{"PHOSEnergyCalibDevice",
                                           inputs,
                                           outputs,
-                                          o2::framework::adaptFromTask<PHOSEnergyCalibDevice>(useCCDB, path, digitspath),
+                                          o2::framework::adaptFromTask<PHOSEnergyCalibDevice>(useCCDB, path, digitspath, ptMin, eMinHGTime, eMinLGTime),
                                           o2::framework::Options{}};
 }
diff --git a/Detectors/PHOS/calib/src/PHOSEnergyCalibrator.cxx b/Detectors/PHOS/calib/src/PHOSEnergyCalibrator.cxx
@@ -26,6 +26,21 @@ PHOSEnergySlot::PHOSEnergySlot()
   mBuffer.reset(new RingBuffer());
   mGeom = Geometry::GetInstance();
 }
+PHOSEnergySlot::PHOSEnergySlot(const PHOSEnergySlot& other)
+{
+  mRunStartTime = other.mRunStartTime;
+  mBuffer.reset(new RingBuffer());
+  mCalibParams.reset(new CalibParams(*(other.mCalibParams)));
+  mBadMap.reset(new BadChannelsMap(*(other.mBadMap)));
+  mEvBC = other.mEvBC;
+  mEvOrbit = other.mEvOrbit;
+  mEvent = 0;
+  mPtMin = other.mPtMin;
+  mEminHGTime = other.mEminHGTime;
+  mEminLGTime = other.mEminLGTime;
+  mDigits.clear();
+  mHistos.reset();
+}
 
 void PHOSEnergySlot::print() const
 {
@@ -54,9 +69,10 @@ void PHOSEnergySlot::fill(const gsl::span<const Cluster>& clusters, const gsl::s
     mBuffer->startNewEvent(); // mark stored clusters to be used for Mixing
     for (int i = firstCluInEvent; i < lastCluInEvent; i++) {
       const Cluster& clu = clusters[i];
-
+      if (clu.getEnergy() < 1.e-4) { //There was problem in unfolding and cluster parameters not calculated
+        continue;
+      }
       fillTimeMassHisto(clu, cluelements);
-      // bool isGood = checkCluster(clu);
 
       uint32_t firstCE = clu.getFirstCluEl();
       uint32_t lastCE = clu.getLastCluEl();
@@ -173,22 +189,7 @@ using Slot = o2::calibration::TimeSlot<o2::phos::PHOSEnergySlot>;
 PHOSEnergyCalibrator::PHOSEnergyCalibrator()
 {
   // create final histos
-  mHistos.reset();
-}
-PHOSEnergySlot::PHOSEnergySlot(const PHOSEnergySlot& other)
-{
-  mRunStartTime = other.mRunStartTime;
-  mBuffer.reset(new RingBuffer());
-  mCalibParams.reset(new CalibParams(*(other.mCalibParams)));
-  mBadMap.reset(new BadChannelsMap(*(other.mBadMap)));
-  mEvBC = other.mEvBC;
-  mEvOrbit = other.mEvOrbit;
-  mEvent = 0;
-  mPtMin = other.mPtMin;
-  mEminHGTime = other.mEminHGTime;
-  mEminLGTime = other.mEminLGTime;
-  mDigits.clear();
-  mHistos.reset();
+  mHistos.reset(new ETCalibHistos());
 }
 
 void PHOSEnergyCalibrator::finalizeSlot(Slot& slot)
@@ -198,7 +199,7 @@ void PHOSEnergyCalibrator::finalizeSlot(Slot& slot)
   es* c = slot.getContainer();
   LOG(INFO) << "Finalize slot " << slot.getTFStart() << " <= TF <= " << slot.getTFEnd();
   //Add histos
-  mHistos.merge(c->getCollectedHistos());
+  mHistos->merge(c->getCollectedHistos());
   //Add collected Digits
   auto tmpD = c->getCollectedDigits();
   //Add to list or write to file directly?
diff --git a/Detectors/PHOS/calib/src/PHOSHGLGRatioCalibDevice.cxx b/Detectors/PHOS/calib/src/PHOSHGLGRatioCalibDevice.cxx
@@ -102,13 +102,13 @@ void PHOSHGLGRatioCalibDevice::fillRatios()
 void PHOSHGLGRatioCalibDevice::calculateRatios()
 {
   // Calculate mean of the ratio
-  int n = o2::phos::Mapping::NCHANNELS;
+  short n = o2::phos::Mapping::NCHANNELS - 1792;
   if (mhRatio->Integral() > 2 * minimalStatistics * n) { //average per channel
 
     TF1* fitFunc = new TF1("fitFunc", "gaus", 0., 4000.);
     fitFunc->SetParameters(1., 200., 60.);
     fitFunc->SetParLimits(1, 10., 2000.);
-    for (short i = o2::phos::Mapping::NCHANNELS; i > 1792; i--) {
+    for (short i = n; i > 0; i--) {
       TH1D* tmp = mhRatio->ProjectionY(Form("channel%d", i), i, i);
       fitFunc->SetParameters(tmp->Integral(), tmp->GetMean(), tmp->GetRMS());
       if (tmp->Integral() < minimalStatistics) {
@@ -117,7 +117,7 @@ void PHOSHGLGRatioCalibDevice::calculateRatios()
       }
       tmp->Fit(fitFunc, "QL0", "", 0., 20.);
       float a = fitFunc->GetParameter(1);
-      mCalibParams->setHGLGRatio(i, a); //absId starts from 0
+      mCalibParams->setHGLGRatio(i + 1792, a); //absId starts from 0
       tmp->Delete();
     }
   }
@@ -128,6 +128,12 @@ void PHOSHGLGRatioCalibDevice::checkRatios()
   //Compare ratios to current ones stored in CCDB
   if (!mUseCCDB) {
     mUpdateCCDB = true;
+    //Set default values for gain and time
+    for (short i = o2::phos::Mapping::NCHANNELS; i > 1792; i--) {
+      mCalibParams->setGain(i, 0.005);
+      mCalibParams->setHGTimeCalib(i, 0.);
+      mCalibParams->setLGTimeCalib(i, 0.);
+    }
     return;
   }
   LOG(INFO) << "Retrieving current HG/LG ratio from CCDB";
diff --git a/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx b/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx
@@ -122,6 +122,9 @@ void PHOSRunbyrunSlot::merge(const PHOSRunbyrunSlot* prev)
 }
 bool PHOSRunbyrunSlot::checkCluster(const Cluster& clu)
 {
+  if (clu.getEnergy() > 1.e-4) {
+    return false;
+  }
   //First check BadMap
   float posX, posZ;
   clu.getLocalPosition(posX, posZ);
diff --git a/Detectors/PHOS/calib/src/PHOSTurnonCalibrator.cxx b/Detectors/PHOS/calib/src/PHOSTurnonCalibrator.cxx
@@ -106,6 +106,9 @@ void PHOSTurnonSlot::scanClusters(const gsl::span<const Cell>& cells, const Trig
   int lastCluInEvent = firstCluInEvent + clutr.getNumberOfObjects();
   for (int i = firstCluInEvent; i < lastCluInEvent; i++) {
     const Cluster& clu = clusters[i];
+    if (clu.getEnergy() < 1.e-4) {
+      continue;
+    }
     mod = clu.module();
     clu.getLocalPosition(x, z);
     short truId = Geometry::relPosToTruId(mod, x, z, ddl);
diff --git a/Detectors/PHOS/calib/src/phos-calib-workflow.cxx b/Detectors/PHOS/calib/src/phos-calib-workflow.cxx
@@ -36,6 +36,10 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
   workflowOptions.push_back(ConfigParamSpec{"ccdbpath", o2::framework::VariantType::String, "http://ccdb-test.cern.ch:8080", {"CCDB address to get current objects"}});
   workflowOptions.push_back(ConfigParamSpec{"digitspath", o2::framework::VariantType::String, "./CalibDigits.root", {"path and name of file to store calib. digits"}});
 
+  workflowOptions.push_back(ConfigParamSpec{"ptminmgg", o2::framework::VariantType::Float, 1.5f, {"minimal pt to fill mgg calib histos"}});
+  workflowOptions.push_back(ConfigParamSpec{"eminhgtime", o2::framework::VariantType::Float, 1.5f, {"minimal E (GeV) to fill HG time calib histos"}});
+  workflowOptions.push_back(ConfigParamSpec{"eminlgtime", o2::framework::VariantType::Float, 5.f, {"minimal E (GeV) to fill LG time calib histos"}});
+
   workflowOptions.push_back(ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}});
 }
 
@@ -57,6 +61,11 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   auto forceUpdate = configcontext.options().get<bool>("forceupdate");
   auto path = configcontext.options().get<std::string>("ccdbpath");
   auto dpath = configcontext.options().get<std::string>("digitspath");
+
+  float ptMin = configcontext.options().get<float>("ptminmgg");
+  float eMinHGTime = configcontext.options().get<float>("eminhgtime");
+  float eMinLGTime = configcontext.options().get<float>("eminlgtime");
+
   if (doPedestals && doHgLgRatio) {
     LOG(FATAL) << "Can not run pedestal and HG/LG calibration simulteneously";
   }
@@ -74,7 +83,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   }
   if (doEnergy) {
     LOG(INFO) << "Filling tree for energy and time calibration ";
-    specs.emplace_back(o2::phos::getPHOSEnergyCalibDeviceSpec(useCCDB, path, dpath));
+    specs.emplace_back(o2::phos::getPHOSEnergyCalibDeviceSpec(useCCDB, path, dpath, ptMin, eMinHGTime, eMinLGTime));
   }
   if (doTurnOn) {
     LOG(INFO) << "TurnOn curves calculation";
diff --git a/Detectors/PHOS/reconstruction/include/PHOSReconstruction/RawBuffer.h b/Detectors/PHOS/reconstruction/include/PHOSReconstruction/RawBuffer.h
@@ -56,17 +56,6 @@ class RawBuffer
   /// \return Number of data words in the superpage
   int getNDataWords() const { return mNDataWords; }
 
-  /// \brief Get the next data word in the superpage
-  /// \return next data word in the superpage
-  /// \throw std::runtime_error if there exists no next data word
-  uint32_t getNextDataWord();
-
-  /// \brief Get the data word at a given index
-  /// \param index index of the word in the buffer
-  /// \return word at requested index
-  /// \throw std::runtime_error if the index is out-of-range
-  uint32_t getWord(int index) const;
-
   /// \brief Get all data words from the raw buffer
   /// \return Span with data words in the buffer (removing trailing null entries)
   const gsl::span<const uint32_t> getDataWords() const { return gsl::span<const uint32_t>(mDataWords.data(), mNDataWords); }
diff --git a/Detectors/PHOS/reconstruction/include/PHOSReconstruction/RawReaderMemory.h b/Detectors/PHOS/reconstruction/include/PHOSReconstruction/RawReaderMemory.h
@@ -66,10 +66,10 @@ class RawReaderMemory
   /// \throw RawDecodingError with HEADER_INVALID if the header was not decoded
   const o2::header::RDHAny& getRawHeader() const;
 
-  /// \brief access to the raw buffer (single DMA page)
-  /// \return Raw buffer of the current page
-  /// \throw Error with PAYLOAD_INCALID if payload was not decoded
-  const RawBuffer& getRawBuffer() const;
+  // /// \brief access to the raw buffer (single DMA page)
+  // /// \return Raw buffer of the current page
+  // /// \throw Error with PAYLOAD_INCALID if payload was not decoded
+  // const RawBuffer& getRawBuffer() const;
 
   /// \brief access to the full raw payload (single or multiple DMA pages)
   /// \return Raw Payload of the data until the stop bit is received.
diff --git a/Detectors/PHOS/reconstruction/src/AltroDecoder.cxx b/Detectors/PHOS/reconstruction/src/AltroDecoder.cxx
@@ -27,16 +27,23 @@ AltroDecoderError::ErrorType_t AltroDecoder::decode(RawReaderMemory& rawreader,
   mOutputHWErrors.clear();
   mOutputFitChi.clear();
 
-  auto& header = rawreader.getRawHeader();
-  mddl = o2::raw::RDHUtils::getFEEID(header);
-
+  try {
+    auto& header = rawreader.getRawHeader();
+    mddl = o2::raw::RDHUtils::getFEEID(header);
+  } catch (...) {
+    return AltroDecoderError::RCU_TRAILER_ERROR;
+  }
   const std::vector<uint32_t>& payloadwords = rawreader.getPayload().getPayloadWords();
 
+  if (payloadwords.size() == 0) {
+    return AltroDecoderError::kOK;
+  }
+
   try {
     gsl::span<const uint32_t> tmp(payloadwords.data(), payloadwords.size());
     mRCUTrailer.constructFromRawPayload(tmp);
   } catch (RCUTrailer::Error& e) {
-    // LOG(ERROR) << "RCU trailer error" << (int)e.getErrorType();
+    LOG(ERROR) << "RCU trailer error " << (int)e.getErrorType();
     mOutputHWErrors.emplace_back(mddl, kGeneralSRUErr, static_cast<char>(e.getErrorType())); //assign general SRU header errors to non-existing FEE 15
     return AltroDecoderError::RCU_TRAILER_ERROR;
   }
@@ -45,7 +52,7 @@ AltroDecoderError::ErrorType_t AltroDecoder::decode(RawReaderMemory& rawreader,
   try {
     readChannels(payloadwords, rawFitter, currentCellContainer, currentTRUContainer);
   } catch (AltroDecoderError::ErrorType_t e) {
-    // LOG(ERROR) << "Altro decoding error " << e;
+    LOG(ERROR) << "Altro decoding error " << e;
     mOutputHWErrors.emplace_back(mddl, kGeneralTRUErr, static_cast<char>(e)); //assign general SRU header errors to non-existing FEE 16
     return e;
   }
diff --git a/Detectors/PHOS/reconstruction/src/RawBuffer.cxx b/Detectors/PHOS/reconstruction/src/RawBuffer.cxx
@@ -59,19 +59,3 @@ void RawBuffer::readFromMemoryBuffer(const gsl::span<const char> rawmemory)
     mDataWords[mNDataWords++] = address[iword];
   }
 }
-
-uint32_t RawBuffer::getWord(int index) const
-{
-  if (index >= mNDataWords) {
-    throw std::runtime_error("Index out of range");
-  }
-  return mDataWords[index];
-}
-
-uint32_t RawBuffer::getNextDataWord()
-{
-  if (!hasNext()) {
-    throw std::runtime_error("No more data words in buffer");
-  }
-  return mDataWords[mCurrentDataWord++];
-}
diff --git a/Detectors/PHOS/reconstruction/src/RawReaderMemory.cxx b/Detectors/PHOS/reconstruction/src/RawReaderMemory.cxx
diff --git a/Detectors/PHOS/workflow/src/RawToCellConverterSpec.cxx b/Detectors/PHOS/workflow/src/RawToCellConverterSpec.cxx

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,9 @@ void PHOSRunbyrunSlot::merge(const PHOSRunbyrunSlot* prev)`
`122`	`122`	`}`
`123`	`123`	`bool PHOSRunbyrunSlot::checkCluster(const Cluster& clu)`
`124`	`124`	`{`
	`125`	`+ if (clu.getEnergy() > 1.e-4) {`
	`126`	`+ return false;`
	`127`	`+ }`
`125`	`128`	`//First check BadMap`
`126`	`129`	`float posX, posZ;`
`127`	`130`	`clu.getLocalPosition(posX, posZ);`