Noise and pedestal retrieval from CDB interface

Author: Andreas Mathis

Detectors/TPC/simulation/CMakeLists.txt

@@ -13,7 +13,6 @@ O2_SETUP(NAME ${MODULE_NAME})
 link_directories( ${LINK_DIRECTORIES})
 
 set(SRCS
-   src/Baseline.cxx
    src/Detector.cxx
    src/DigitMCMetaData.cxx
    src/DigitContainer.cxx
@@ -30,7 +29,6 @@ set(SRCS
 )
 
 set(HEADERS
-   include/${MODULE_NAME}/Baseline.h
    include/${MODULE_NAME}/Detector.h
    include/${MODULE_NAME}/DigitMCMetaData.h
    include/${MODULE_NAME}/DigitContainer.h

Detectors/TPC/simulation/include/TPCSimulation/Baseline.h

@@ -17,11 +17,13 @@
 
 #include <Vc/Vc>
 
-#include "TPCBase/PadSecPos.h"
+#include "TPCBase/PadPos.h"
+#include "TPCBase/CalDet.h"
+#include "TPCBase/CRU.h"
+#include "TPCBase/RandomRing.h"
 #include "TPCBase/ParameterDetector.h"
 #include "TPCBase/ParameterElectronics.h"
 #include "TPCBase/ParameterGas.h"
-#include "TPCSimulation/Baseline.h"
 
 #include "TSpline.h"
 
@@ -59,11 +61,12 @@ class SAMPAProcessing
   /// \return ADC value of the (saturated) SAMPA
   float getADCSaturation(const float signal) const;
 
-  /// Make the full signal including noise and pedestals from the Baseline class
+  /// Make the full signal including noise and pedestals from the OCDB
   /// \param ADCcounts ADC value of the signal (common mode already subtracted)
-  /// \param padSecPos PadSecPos of the signal
+  /// \param cru CRU of the signal
+  /// \param padPos PadPos of the signal
   /// \return ADC value after application of noise, pedestal and saturation
-  float makeSignal(float ADCcounts, const PadSecPos& padSecPos, float& pedestal, float& noise) const;
+  float makeSignal(float ADCcounts, const CRU& cru, const PadPos& pos, float& pedestal, float& noise);
 
   /// A delta signal is shaped by the FECs and thus spread over several time bins
   /// This function returns an array with the signal spread into the following time bins
@@ -106,6 +109,18 @@ class SAMPAProcessing
   /// \return Time of the time bin of the charge
   float getTimeBinTime(float time) const;
 
+  /// Get the noise for a given channel
+  /// \param cru CRU of the channel of interest
+  /// \param padPos PadPos of the channel of interest
+  /// \return Noise on the channel of interest
+  float getNoise(const CRU& cru, const PadPos& pos);
+
+  /// Get the pedestal for a given channel
+  /// \param cru CRU of the channel of interest
+  /// \param padPos PadPos of the channel of interest
+  /// \return Pedestal on the channel of interest
+  float getPedestal(const CRU& cru, const PadPos& pos) const;
+
  private:
   SAMPAProcessing();
 
@@ -120,6 +135,9 @@ class SAMPAProcessing
   const ParameterGas* mGasParam;         ///< Caching of the parameter class to avoid multiple CDB calls
   const ParameterDetector* mDetParam;    ///< Caching of the parameter class to avoid multiple CDB calls
   const ParameterElectronics* mEleParam; ///< Caching of the parameter class to avoid multiple CDB calls
+  const CalPad* mNoiseMap;               ///< Caching of the parameter class to avoid multiple CDB calls
+  const CalPad* mPedestalMap;            ///< Caching of the parameter class to avoid multiple CDB calls
+  RandomRing mRandomNoiseRing;           ///< Ring with random number for noise
 };
 
 template <typename T>
@@ -130,14 +148,12 @@ inline T SAMPAProcessing::getADCvalue(T nElectrons) const
   return nElectrons * conversion;
 }
 
-inline float SAMPAProcessing::makeSignal(float ADCcounts, const PadSecPos& padSecPos,
-                                         float& pedestal, float& noise) const
+inline float SAMPAProcessing::makeSignal(float ADCcounts, const CRU& cru, const PadPos& pos,
+                                         float& pedestal, float& noise)
 {
-  static Baseline baseline;
   float signal = ADCcounts;
-  /// \todo Pedestal to be implemented in baseline class
-  //  pedestal = baseline.getPedestal(padSecPos);
-  noise = baseline.getNoise(padSecPos);
+  pedestal = getPedestal(cru, pos);
+  noise = getNoise(cru, pos);
   switch (mEleParam->getDigitizationMode()) {
     case DigitzationMode::FullMode: {
       signal += noise;
@@ -216,6 +232,16 @@ inline float SAMPAProcessing::getTimeBinTime(float time) const
   TimeBin timeBin = getTimeBinFromTime(time);
   return getTimeFromBin(timeBin);
 }
+
+inline float SAMPAProcessing::getNoise(const CRU& cru, const PadPos& pos)
+{
+  return mRandomNoiseRing.getNextValue() * mNoiseMap->getValue(cru, pos.getRow(), pos.getPad());
+}
+
+inline float SAMPAProcessing::getPedestal(const CRU& cru, const PadPos& pos) const
+{
+  return mPedestalMap->getValue(cru, pos.getRow(), pos.getPad());
+}
 }
 }
 

Detectors/TPC/simulation/include/TPCSimulation/SAMPAProcessing.h

@@ -29,7 +29,7 @@ void DigitGlobalPad::fillOutputContainer(std::vector<Digit>* output,
                                          GlobalPadNumber globalPad, float commonMode)
 {
   const static Mapper& mapper = Mapper::instance();
-  const static SAMPAProcessing& sampaProcessing = SAMPAProcessing::instance();
+  static SAMPAProcessing& sampaProcessing = SAMPAProcessing::instance();
   const PadPos pad = mapper.padPos(globalPad);
 
   /// The charge accumulated on that pad is converted into ADC counts, saturation of the SAMPA is applied and a Digit
@@ -38,7 +38,7 @@ void DigitGlobalPad::fillOutputContainer(std::vector<Digit>* output,
                                                   // pedestals and saturation of the SAMPA
 
   float noise, pedestal;
-  const float mADC = sampaProcessing.makeSignal(totalADC, PadSecPos(cru.sector(), pad), pedestal, noise);
+  const float mADC = sampaProcessing.makeSignal(totalADC, cru, pad, pedestal, noise);
 
   /// only write out the data if there is actually charge on that pad
   if (mADC > 0 && mChargePad > 0) {

Detectors/TPC/simulation/src/Baseline.cxx

@@ -23,7 +23,7 @@
 
 using namespace o2::TPC;
 
-SAMPAProcessing::SAMPAProcessing() : mSaturationSpline()
+SAMPAProcessing::SAMPAProcessing() : mSaturationSpline(), mRandomNoiseRing(RandomRing::RandomType::Gaus)
 {
   updateParameters();
   importSaturationCurve("SAMPA_saturation.dat");
@@ -37,6 +37,8 @@ void SAMPAProcessing::updateParameters()
   mGasParam = &(cdb.getParameterGas());
   mDetParam = &(cdb.getParameterDetector());
   mEleParam = &(cdb.getParameterElectronics());
+  mPedestalMap = &(cdb.getPedestals());
+  mNoiseMap = &(cdb.getNoise());
 }
 
 bool SAMPAProcessing::importSaturationCurve(std::string file)

Detectors/TPC/simulation/src/DigitGlobalPad.cxx

@@ -14,7 +14,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::TPC::Baseline + ;
 #pragma link C++ class o2::TPC::Detector + ;
 #pragma link C++ class o2::Base::DetImpl < o2::TPC::Detector > +;
 #pragma link C++ class o2::TPC::DigitMCMetaData + ;