Merge pull request #7 from alibuild/alibot-cleanup-15600

mhemmer-cern · web-flow · commit e7dbd6169fda · 2026-07-15T13:52:30.000+02:00
Please consider the following formatting changes to #15600
diff --git a/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/CellLabel.h b/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/CellLabel.h
@@ -12,7 +12,6 @@
 #ifndef ALICEO2_EMCAL_CELLLABEL_H_
 #define ALICEO2_EMCAL_CELLLABEL_H_
 
-
 #include <cstddef>
 #include <cstdint>
 #include <span>
diff --git a/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/MCLabel.h b/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/MCLabel.h
@@ -36,6 +36,6 @@ class MCLabel : public o2::MCCompLabel
 
   ClassDefNV(MCLabel, 2);
 };
-} //namespace o2::emcal
+} // namespace o2::emcal
 
 #endif
diff --git a/DataFormats/Detectors/EMCAL/src/Cell.cxx b/DataFormats/Detectors/EMCAL/src/Cell.cxx
@@ -62,7 +62,6 @@ const float
 }
 } // namespace EnergyEncoding
 
-
 namespace DecodingV0
 {
 struct __attribute__((packed)) CellDataPacked {
diff --git a/Detectors/EMCAL/base/include/EMCALBase/Geometry.h b/Detectors/EMCAL/base/include/EMCALBase/Geometry.h
@@ -473,7 +473,7 @@ class Geometry
   {
     if (GetSMType(nSupMod) == EMCAL_HALF) {
       return mNPhi / 2;
-    } 
+    }
     if (GetSMType(nSupMod) == EMCAL_THIRD || GetSMType(nSupMod) == DCAL_EXT) {
       return mNPhi / 3;
     }
@@ -633,12 +633,12 @@ class Geometry
   std::tuple<int, int, int, int> CalculateCellIndex(Int_t absId) const;
 
   std::string mGeoName;                     ///< Geometry name string
-  Int_t mKey110DEG = 0;                         ///< For calculation abs cell id; 19-oct-05
-  Int_t mnSupModInDCAL = 0;                     ///< For calculation abs cell id; 06-nov-12
-  Int_t mNCellsInSupMod = 0;                    ///< Number cell in super module
-  Int_t mNETAdiv = 0;                           ///< Number eta division of module
-  Int_t mNPHIdiv = 0;                           ///< Number phi division of module
-  Int_t mNCellsInModule = 0;                    ///< Number cell in module
+  Int_t mKey110DEG = 0;                     ///< For calculation abs cell id; 19-oct-05
+  Int_t mnSupModInDCAL = 0;                 ///< For calculation abs cell id; 06-nov-12
+  Int_t mNCellsInSupMod = 0;                ///< Number cell in super module
+  Int_t mNETAdiv = 0;                       ///< Number eta division of module
+  Int_t mNPHIdiv = 0;                       ///< Number phi division of module
+  Int_t mNCellsInModule = 0;                ///< Number cell in module
   std::vector<Double_t> mPhiBoundariesOfSM; ///< Phi boundaries of SM in rad; size is fNumberOfSuperModules;
   std::vector<Double_t> mPhiCentersOfSM;    ///< Phi of centers of SM; size is fNumberOfSuperModules/2
   std::vector<Double_t> mPhiCentersOfSMSec; ///< Phi of centers of section where SM lies; size is fNumberOfSuperModules/2
@@ -649,30 +649,30 @@ class Geometry
   std::vector<Double_t> mCentersOfCellsPhiDir; ///< Size fNPhi*fNPHIdiv (for TRD1 only) (phi or y in SM, in cm)
   std::vector<Double_t>
     mEtaCentersOfCells;                                     ///< [fNEta*fNETAdiv*fNPhi*fNPHIdiv], positive direction (eta>0); eta depend from phi position;
-  Int_t mNCells = 0;                                            ///< Number of cells in calo
-  Int_t mNPhi = 0;                                              ///< Number of Towers in the PHI direction
+  Int_t mNCells = 0;                                        ///< Number of cells in calo
+  Int_t mNPhi = 0;                                          ///< Number of Towers in the PHI direction
   std::vector<Double_t> mCentersOfCellsXDir;                ///< Size fNEta*fNETAdiv (for TRD1 only) (       x in SM, in cm)
   std::array<float, 3> mEnvelop{};                          ///< The GEANT TUB for the detector
-  Float_t mArm1EtaMin = 0;                                      ///< Minimum pseudorapidity position of EMCAL in Eta
-  Float_t mArm1EtaMax = 0;                                      ///< Maximum pseudorapidity position of EMCAL in Eta
-  Float_t mArm1PhiMin = 0;                                      ///< Minimum angular position of EMCAL in Phi (degrees)
-  Float_t mArm1PhiMax = 0;                                      ///< Maximum angular position of EMCAL in Phi (degrees)
-  Float_t mEtaMaxOfTRD1 = 0;                                    ///< Max eta in case of TRD1 geometry (see AliEMCALShishKebabTrd1Module)
-  Float_t mDCALPhiMin = 0;                                      ///< Minimum angular position of DCAL in Phi (degrees)
-  Float_t mDCALPhiMax = 0;                                      ///< Maximum angular position of DCAL in Phi (degrees)
-  Float_t mEMCALPhiMax = 0;                                     ///< Maximum angular position of EMCAL in Phi (degrees)
-  Float_t mDCALStandardPhiMax = 0;                              ///< Special edge for the case that DCAL contian extension
-  Float_t mDCALInnerExtandedEta = 0;                            ///< DCAL inner edge in Eta (with some extension)
-  Float_t mDCALInnerEdge = 0;                                   ///< Inner edge for DCAL
+  Float_t mArm1EtaMin = 0;                                  ///< Minimum pseudorapidity position of EMCAL in Eta
+  Float_t mArm1EtaMax = 0;                                  ///< Maximum pseudorapidity position of EMCAL in Eta
+  Float_t mArm1PhiMin = 0;                                  ///< Minimum angular position of EMCAL in Phi (degrees)
+  Float_t mArm1PhiMax = 0;                                  ///< Maximum angular position of EMCAL in Phi (degrees)
+  Float_t mEtaMaxOfTRD1 = 0;                                ///< Max eta in case of TRD1 geometry (see AliEMCALShishKebabTrd1Module)
+  Float_t mDCALPhiMin = 0;                                  ///< Minimum angular position of DCAL in Phi (degrees)
+  Float_t mDCALPhiMax = 0;                                  ///< Maximum angular position of DCAL in Phi (degrees)
+  Float_t mEMCALPhiMax = 0;                                 ///< Maximum angular position of EMCAL in Phi (degrees)
+  Float_t mDCALStandardPhiMax = 0;                          ///< Special edge for the case that DCAL contian extension
+  Float_t mDCALInnerExtandedEta = 0;                        ///< DCAL inner edge in Eta (with some extension)
+  Float_t mDCALInnerEdge = 0;                               ///< Inner edge for DCAL
   std::vector<ShishKebabTrd1Module> mShishKebabTrd1Modules; ///< List of modules
   std::array<float, 3> mParSM{};                            ///< SM sizes as in GEANT (TRD1)
-  Float_t mPhiModuleSize = 0;                                   ///< Phi -> X
-  Float_t mEtaModuleSize = 0;                                   ///< Eta -> Y
-  Float_t mPhiTileSize = 0;                                     ///< Size of phi tile
-  Float_t mEtaTileSize = 0;                                     ///< Size of eta tile
-  Int_t mNZ = 0;                                                ///< Number of Towers in the Z direction
-  Float_t mIPDistance = 0;                                      ///< Radial Distance of the inner surface of the EMCAL
-  Float_t mLongModuleSize = 0;                                  ///< Size of long module
+  Float_t mPhiModuleSize = 0;                               ///< Phi -> X
+  Float_t mEtaModuleSize = 0;                               ///< Eta -> Y
+  Float_t mPhiTileSize = 0;                                 ///< Size of phi tile
+  Float_t mEtaTileSize = 0;                                 ///< Size of eta tile
+  Int_t mNZ = 0;                                            ///< Number of Towers in the Z direction
+  Float_t mIPDistance = 0;                                  ///< Radial Distance of the inner surface of the EMCAL
+  Float_t mLongModuleSize = 0;                              ///< Size of long module
 
   // Geometry Parameters
   Float_t mShellThickness = 0; ///< Total thickness in (x,y) direction
diff --git a/Detectors/EMCAL/base/src/ClusterFactory.cxx b/Detectors/EMCAL/base/src/ClusterFactory.cxx
@@ -817,7 +817,7 @@ float ClusterFactory<InputType>::GetCellWeight(float eCell, float eCluster) cons
       return std::max(0.f, mLogWeight + std::log(eCell / eCluster));
     }
     return std::log(eCluster / eCell);
-  } 
+  }
   return 0.;
 }
 
diff --git a/Detectors/EMCAL/base/src/Geometry.cxx b/Detectors/EMCAL/base/src/Geometry.cxx
@@ -230,7 +230,7 @@ Geometry* Geometry::GetInstanceFromRunNumber(Int_t runNumber, const std::string_
                    "<<EMCAL_COMPLETE12SMV1>>";
     }
     return Geometry::GetInstance("EMCAL_COMPLETE12SMV1", mcname, mctitle);
-  } 
+  }
   // Run 2
   // EMCAL + DCAL geometry, 20 SM. Year 2015 and on
 
@@ -241,7 +241,7 @@ Geometry* Geometry::GetInstanceFromRunNumber(Int_t runNumber, const std::string_
               << "\t In use <<EMCAL_COMPLETE12SMV1_DCAL_8SM>>, check run number and year";
   } else {
     LOG(info) << "o2::emcal::Geometry::GetInstanceFromRunNumber() - Initialized geometry with name "
-                  "<<EMCAL_COMPLETE12SMV1_DCAL_8SM>>";
+                 "<<EMCAL_COMPLETE12SMV1_DCAL_8SM>>";
   }
   return Geometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_8SM", mcname, mctitle);
 }
@@ -873,7 +873,7 @@ Int_t Geometry::SuperModuleNumberFromEtaPhi(Double_t eta, Double_t phi) const
       }
 
       if (GetSMType(nSupMod) == DCAL_STANDARD) { // Gap between DCAL
-        const Int_t nEtaThird = GetNEta() / 3; // integer division intended: truncate to whole eta-bin count
+        const Int_t nEtaThird = GetNEta() / 3;   // integer division intended: truncate to whole eta-bin count
         if (TMath::Abs(eta) < nEtaThird * mTrd1Angle * TMath::DegToRad()) {
           throw InvalidPositionException(eta, phi);
         }
@@ -1508,15 +1508,14 @@ o2::emcal::AcceptanceType_t Geometry::IsInEMCALOrDCAL(const math_utils::Point3D<
 
   if (phi >= mArm1PhiMin && phi <= mEMCALPhiMax) {
     return EMCAL_ACCEPTANCE;
-  } 
+  }
   if (phi >= mDCALPhiMin && phi <= mDCALStandardPhiMax && TMath::Abs(eta) > mDCALInnerExtandedEta) {
     return DCAL_ACCEPTANCE;
-  } 
+  }
   if (phi > mDCALStandardPhiMax && phi <= mDCALPhiMax) {
     return DCAL_ACCEPTANCE;
   }
   return NON_ACCEPTANCE;
-
 }
 
 const TGeoHMatrix* Geometry::GetMatrixForSuperModule(Int_t smod) const

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ const float`
`62`	`62`	`}`
`63`	`63`	`} // namespace EnergyEncoding`
`64`	`64`
`65`		`-`
`66`	`65`	`namespace DecodingV0`
`67`	`66`	`{`
`68`	`67`	`struct __attribute__((packed)) CellDataPacked {`
Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ float ClusterFactory<InputType>::GetCellWeight(float eCell, float eCluster) cons`
`817`	`817`	`return std::max(0.f, mLogWeight + std::log(eCell / eCluster));`
`818`	`818`	`}`
`819`	`819`	`return std::log(eCluster / eCell);`
`820`		`- }`
	`820`	`+ }`
`821`	`821`	`return 0.;`
`822`	`822`	`}`
`823`	`823`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ Geometry* Geometry::GetInstanceFromRunNumber(Int_t runNumber, const std::string_`
`230`	`230`	`"<<EMCAL_COMPLETE12SMV1>>";`
`231`	`231`	`}`
`232`	`232`	`return Geometry::GetInstance("EMCAL_COMPLETE12SMV1", mcname, mctitle);`
`233`		`- }`
	`233`	`+ }`
`234`	`234`	`// Run 2`
`235`	`235`	`// EMCAL + DCAL geometry, 20 SM. Year 2015 and on`
`236`	`236`
`@@ -241,7 +241,7 @@ Geometry* Geometry::GetInstanceFromRunNumber(Int_t runNumber, const std::string_`
`241`	`241`	`<< "\t In use <<EMCAL_COMPLETE12SMV1_DCAL_8SM>>, check run number and year";`
`242`	`242`	`} else {`
`243`	`243`	`LOG(info) << "o2::emcal::Geometry::GetInstanceFromRunNumber() - Initialized geometry with name "`
`244`		`- "<<EMCAL_COMPLETE12SMV1_DCAL_8SM>>";`
	`244`	`+ "<<EMCAL_COMPLETE12SMV1_DCAL_8SM>>";`
`245`	`245`	`}`
`246`	`246`	`return Geometry::GetInstance("EMCAL_COMPLETE12SMV1_DCAL_8SM", mcname, mctitle);`
`247`	`247`	`}`
`@@ -873,7 +873,7 @@ Int_t Geometry::SuperModuleNumberFromEtaPhi(Double_t eta, Double_t phi) const`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`if (GetSMType(nSupMod) == DCAL_STANDARD) { // Gap between DCAL`
`876`		`- const Int_t nEtaThird = GetNEta() / 3; // integer division intended: truncate to whole eta-bin count`
	`876`	`+ const Int_t nEtaThird = GetNEta() / 3; // integer division intended: truncate to whole eta-bin count`
`877`	`877`	`if (TMath::Abs(eta) < nEtaThird * mTrd1Angle * TMath::DegToRad()) {`
`878`	`878`	`throw InvalidPositionException(eta, phi);`
`879`	`879`	`}`
`@@ -1508,15 +1508,14 @@ o2::emcal::AcceptanceType_t Geometry::IsInEMCALOrDCAL(const math_utils::Point3D<`
`1508`	`1508`
`1509`	`1509`	`if (phi >= mArm1PhiMin && phi <= mEMCALPhiMax) {`
`1510`	`1510`	`return EMCAL_ACCEPTANCE;`
`1511`		`- }`
	`1511`	`+ }`
`1512`	`1512`	`if (phi >= mDCALPhiMin && phi <= mDCALStandardPhiMax && TMath::Abs(eta) > mDCALInnerExtandedEta) {`
`1513`	`1513`	`return DCAL_ACCEPTANCE;`
`1514`		`- }`
	`1514`	`+ }`
`1515`	`1515`	`if (phi > mDCALStandardPhiMax && phi <= mDCALPhiMax) {`
`1516`	`1516`	`return DCAL_ACCEPTANCE;`
`1517`	`1517`	`}`
`1518`	`1518`	`return NON_ACCEPTANCE;`
`1519`		`-`
`1520`	`1519`	`}`
`1521`	`1520`
`1522`	`1521`	`const TGeoHMatrix* Geometry::GetMatrixForSuperModule(Int_t smod) const`