Skip to content

Please consider the following formatting changes to #15600 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhemmer-cern merged 1 commit into from
Jul 15, 2026
Merged

Please consider the following formatting changes to #15600 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/CellLabel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#ifndef ALICEO2_EMCAL_CELLLABEL_H_
#define ALICEO2_EMCAL_CELLLABEL_H_


#include <cstddef>
#include <cstdint>
#include <span>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/MCLabel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ class MCLabel : public o2::MCCompLabel

ClassDefNV(MCLabel, 2);
};
} //namespace o2::emcal
} // namespace o2::emcal

#endif
1 change: 0 additions & 1 deletion DataFormats/Detectors/EMCAL/src/Cell.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const float
}
} // namespace EnergyEncoding


namespace DecodingV0
{
struct __attribute__((packed)) CellDataPacked {
Expand Down
54 changes: 27 additions & 27 deletions Detectors/EMCAL/base/include/EMCALBase/Geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Detectors/EMCAL/base/src/ClusterFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.;
}

Expand Down
11 changes: 5 additions & 6 deletions Detectors/EMCAL/base/src/Geometry.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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
Expand Down