ITS3: DigiParams amendment

Signed-off-by: Felix Schlepper <[email protected]>

Author: f3sch

Detectors/Upgrades/ITS3/simulation/CMakeLists.txt

@@ -14,6 +14,7 @@ o2_add_library(ITS3Simulation
                        src/ITS3Services.cxx
                        src/DescriptorInnerBarrelITS3.cxx
                        src/Digitizer.cxx
+                       src/DigiParams.cxx
                PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat
                                      O2::ITSBase O2::ITSMFTSimulation
                                      ROOT::Physics)
@@ -23,6 +24,7 @@ o2_target_root_dictionary(ITS3Simulation
                                   include/ITS3Simulation/ITS3Services.h
                                   include/ITS3Simulation/DescriptorInnerBarrelITS3.h
                                   include/ITS3Simulation/Digitizer.h
+                                  include/ITS3Simulation/DigiParams.h
                                   )
 
-o2_data_file(COPY data  DESTINATION Detectors/ITS3/simulation)
+o2_data_file(COPY data  DESTINATION Detectors/ITS3/simulation)

Detectors/Upgrades/ITS3/simulation/include/ITS3Simulation/DigiParams.h

@@ -1,19 +1,25 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
 #ifndef ITS3_DIGIPARAMS_H
 #define ITS3_DIGIPARAMS_H
 
 #include "ITSMFTSimulation/DigiParams.h"
 
-namespace o2 {
-
-namespace its3
+namespace o2::its3
 {
 
-class DigiParams : public o2::itsmft::DigiParams
+class DigiParams final : public o2::itsmft::DigiParams
 {
  public:
-  DigiParams() = default;
-  ~DigiParams() = default;
-
   const o2::itsmft::AlpideSimResponse* getAlpSimResponse() const = delete;
   void setAlpSimResponse(const o2::itsmft::AlpideSimResponse* par) = delete;
 
@@ -23,17 +29,17 @@ class DigiParams : public o2::itsmft::DigiParams
   const o2::itsmft::AlpideSimResponse* getIBSimResponse() const { return mIBSimResponse; }
   void setIBSimResponse(const o2::itsmft::AlpideSimResponse* response) { mIBSimResponse = response; }
 
-  void print() const;
+  bool hasResponseFunctions() const { return mIBSimResponse != nullptr && mOBSimResponse != nullptr; }
+
+  void print() const final;
 
  private:
-  const o2::itsmft::AlpideSimResponse* mOBSimResponse = nullptr;  //!< pointer to external response
-  const o2::itsmft::AlpideSimResponse* mIBSimResponse = nullptr;  //!< pointer to external response
+  const o2::itsmft::AlpideSimResponse* mOBSimResponse = nullptr; //!< pointer to external response
+  const o2::itsmft::AlpideSimResponse* mIBSimResponse = nullptr; //!< pointer to external response
 
   ClassDefNV(DigiParams, 1);
 };
 
-} // namespace its3
-
-} // namespace o2
+} // namespace o2::its3
 
-#endif
+#endif

Detectors/Upgrades/ITS3/simulation/src/DigiParams.cxx

@@ -12,28 +12,29 @@
 /// \file DigiParams.cxx
 /// \brief Implementation of the ITS3 digitization steering params
 
-#include <fairlogger/Logger.h> // for LOG
+#include "Framework/Logger.h"
 #include "ITS3Simulation/DigiParams.h"
-#include <cassert>
 
 ClassImp(o2::its3::DigiParams);
 
-using namespace o2::its3;
+namespace o2::its3
+{
 
-//______________________________________________
 void DigiParams::print() const
 {
   // print settings
-  printf("ITS3 DigiParams settings:\n");
-  printf("Continuous readout             : %s\n", isContinuous() ? "ON" : "OFF");
-  printf("Readout Frame Length(ns)       : %f\n", getROFrameLength());
-  printf("Strobe delay (ns)              : %f\n", getStrobeDelay());
-  printf("Strobe length (ns)             : %f\n", getStrobeLength());
-  printf("Threshold (N electrons)        : %d\n", getChargeThreshold());
-  printf("Min N electrons to account     : %d\n", getMinChargeToAccount());
-  printf("Number of charge sharing steps : %d\n", getNSimSteps());
-  printf("ELoss to N electrons factor    : %e\n", getEnergyToNElectrons());
-  printf("Noise level per pixel          : %e\n", getNoisePerPixel());
-  printf("Charge time-response:\n");
+  LOGF(info, "ITS3 DigiParams settings:\n");
+  LOGF(info, "Continuous readout             : %s\n", isContinuous() ? "ON" : "OFF");
+  LOGF(info, "Readout Frame Length(ns)       : %f\n", getROFrameLength());
+  LOGF(info, "Strobe delay (ns)              : %f\n", getStrobeDelay());
+  LOGF(info, "Strobe length (ns)             : %f\n", getStrobeLength());
+  LOGF(info, "Threshold (N electrons)        : %d\n", getChargeThreshold());
+  LOGF(info, "Min N electrons to account     : %d\n", getMinChargeToAccount());
+  LOGF(info, "Number of charge sharing steps : %d\n", getNSimSteps());
+  LOGF(info, "ELoss to N electrons factor    : %e\n", getEnergyToNElectrons());
+  LOGF(info, "Noise level per pixel          : %e\n", getNoisePerPixel());
+  LOGF(info, "Charge time-response:\n");
   getSignalShape().print();
 }
+
+} // namespace o2::its3