ITS3: add braces and some reordering in ChipDigitsContainer

Author: f3sch

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

@@ -12,23 +12,18 @@
 #ifndef ALICEO2_ITS3_CHIPDIGITSCONTAINER_
 #define ALICEO2_ITS3_CHIPDIGITSCONTAINER_
 
-#include "ITSMFTBase/SegmentationAlpide.h"        // Base class in o2::itsmft namespace
-#include "ITSMFTSimulation/ChipDigitsContainer.h" // Base class in o2::itsmft namespace
-#include "ITS3Base/SegmentationMosaix.h"          // OB segmentation implementation
-#include "ITS3Base/SpecsV2.h"                     // Provides SpecsV2::isDetITS3() interface
-#include "ITS3Simulation/DigiParams.h"            // ITS3-specific DigiParams interface
+#include "ITSMFTBase/SegmentationAlpide.h"
+#include "ITSMFTSimulation/ChipDigitsContainer.h"
+#include "ITS3Base/SegmentationMosaix.h"
+#include "ITS3Base/SpecsV2.h"
+#include "ITS3Simulation/DigiParams.h"
 #include <TRandom.h>
 
 namespace o2::its3
 {
 
 class ChipDigitsContainer : public o2::itsmft::ChipDigitsContainer
 {
- private:
-  bool innerBarrel; ///< true if the chip belongs to the inner barrel (IB), false if outer barrel (OB)
-  int maxRows;      ///< maximum number of rows
-  int maxCols;      ///< maximum number of columns
-
  public:
   explicit ChipDigitsContainer(UShort_t idx = 0);
 
@@ -51,9 +46,14 @@ class ChipDigitsContainer : public o2::itsmft::ChipDigitsContainer
   void addNoise(UInt_t rofMin, UInt_t rofMax, const o2::itsmft::DigiParams* params, int maxRows = o2::itsmft::SegmentationAlpide::NRows, int maxCols = o2::itsmft::SegmentationAlpide::NCols) = delete;
   void addNoise(UInt_t rofMin, UInt_t rofMax, const o2::its3::DigiParams* params);
 
+ private:
+  bool innerBarrel{false}; ///< true if the chip belongs to the inner barrel (IB), false if outer barrel (OB)
+  int maxRows{-1};         ///< maximum number of rows
+  int maxCols{-1};         ///< maximum number of columns
+
   ClassDefNV(ChipDigitsContainer, 1);
 };
 
 } // namespace o2::its3
 
-#endif // ALICEO2_ITS3_CHIPDIGITSCONTAINER_
+#endif // ALICEO2_ITS3_CHIPDIGITSCONTAINER_

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

@@ -11,10 +11,7 @@
 
 #include "ITS3Simulation/ChipDigitsContainer.h"
 
-namespace o2
-{
-namespace its3
-{
+using namespace o2::its3;
 
 ChipDigitsContainer::ChipDigitsContainer(UShort_t idx)
   : o2::itsmft::ChipDigitsContainer(idx) {}
@@ -48,16 +45,17 @@ void ChipDigitsContainer::addNoise(UInt_t rofMin, UInt_t rofMax, const o2::its3:
     for (Int_t i = 0; i < nhits; ++i) {
       row = gRandom->Integer(maxRows);
       col = gRandom->Integer(maxCols);
-      if (mNoiseMap && mNoiseMap->isNoisy(mChipIndex, row, col))
+      if (mNoiseMap && mNoiseMap->isNoisy(mChipIndex, row, col)) {
         continue;
-      if (mDeadChanMap && mDeadChanMap->isNoisy(mChipIndex, row, col))
+      }
+      if (mDeadChanMap && mDeadChanMap->isNoisy(mChipIndex, row, col)) {
         continue;
+      }
       auto key = getOrderingKey(rof, row, col);
-      if (!findDigit(key))
+      if (!findDigit(key)) {
         addDigit(key, rof, row, col, nel, o2::MCCompLabel(true));
+      }
     }
   }
 }
-
-} // namespace its3
-} // namespace o2
+// namespace its3