Skip to content

Please consider the following formatting changes to #15998 #18

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
maciacco merged 1 commit into from
Oct 23, 2026
Merged

Please consider the following formatting changes to #15998 #18

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
16 changes: 8 additions & 8 deletions Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/IOTOFBaseParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ struct IOTOFBaseParam : public o2::conf::ConfigurableParamHelper<IOTOFBaseParam>
float sensorThickness = 0.0050f; // thickness of the sensor in cm, for all layers for the moment, the default is set to 50 microns

// ITOF segmentation parameters
float itofRadius = 21.38f; // ITOF radius (cm)
float itofLength = 126.82f; // ITOF length (cm)
int itofNStaves = 28; // ITOF number of staves
float itofStaveTilt = 6.63; // ITOF stave tilt angle (deg)
float itofRadius = 21.38f; // ITOF radius (cm)
float itofLength = 126.82f; // ITOF length (cm)
int itofNStaves = 28; // ITOF number of staves
float itofStaveTilt = 6.63; // ITOF stave tilt angle (deg)

// OTOF segmentation parameters
float otofRadius = 92.f; // OTOF radius (cm)
float otofLength = 688.54f; // OTOF length (cm)
int otofNStaves = 62; // OTOF number of staves
float otofStaveTilt = 5; // OTOF stave tilt angle (deg)
float otofRadius = 92.f; // OTOF radius (cm)
float otofLength = 688.54f; // OTOF length (cm)
int otofNStaves = 62; // OTOF number of staves
float otofStaveTilt = 5; // OTOF stave tilt angle (deg)

O2ParamDef(IOTOFBaseParam, "IOTOFBase");
};
Expand Down
8 changes: 4 additions & 4 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ class Layer
int mModulesPerStave{0}; // Number of modules along a stave
double mTiltAngle{0.0}; // Tilt angle in degrees to be applied as a rotation around the local center of the stave

static const int sChipsPerRow; // number of chips per row in module
static const int sChipsPerCol; // number of chips per col in module
static const double sChipGap; // gap between chips in module
static const double sModuleGap; // gap between modules in stave
static const int sChipsPerRow; // number of chips per row in module
static const int sChipsPerCol; // number of chips per col in module
static const double sChipGap; // gap between chips in module
static const double sModuleGap; // gap between modules in stave
static const double sChipThickness; // full thickness of the chip
};

Expand Down
11 changes: 5 additions & 6 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Layer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ void ITOFLayer::createLayer(TGeoVolume* motherVolume)
case kBarrelSegmented: {
// First we create the volume for the whole layer, which will be used as mother volume for the segments
const double avgRadius = 0.5 * (mInnerRadius + mOuterRadius);
const double staveSizeX = mStaves.second; // cm
const double staveSizeY = mOuterRadius - mInnerRadius; // cm
const double staveSizeZ = mZLength; // cm
const double staveSizeX = mStaves.second; // cm
const double staveSizeY = mOuterRadius - mInnerRadius; // cm
const double staveSizeZ = mZLength; // cm

// Build the mother layer tube from the exact inscribed/outscribed radii of a tilted stave rectangle.
const double alpha = mTiltAngle * TMath::DegToRad();
Expand Down Expand Up @@ -238,7 +238,7 @@ void ITOFLayer::createLayer(TGeoVolume* motherVolume)
// Now we build a stave from modules
for (int j = 0; j < mModulesPerStave; ++j) {
LOGP(info, "iTOF: Creating module for stave {}/{}", j + 1, mModulesPerStave);
auto* translation = new TGeoTranslation(0., staveSizeY * 0.5, (j + 0.5) * moduleSizeZ + j * 0.02 - 0.5 * staveSizeZ);
auto* translation = new TGeoTranslation(0., staveSizeY * 0.5, (j + 0.5) * moduleSizeZ + j * 0.02 - 0.5 * staveSizeZ);
staveVol->AddNode(moduleVol, 1 + j, translation);
}

Expand Down Expand Up @@ -371,11 +371,10 @@ void OTOFLayer::createLayer(TGeoVolume* motherVolume)
// Now we build a substave from modules
for (int j = 0; j < modulesPerSubStave; ++j) {
LOGP(info, "oTOF: Creating module for substave {}/{}", j + 1, modulesPerSubStave);
auto* translation = new TGeoTranslation(0., subStaveSizeY * 0.5, (j + 0.5) * moduleSizeZ + j * 0.02 - 0.5 * subStaveSizeZ);
auto* translation = new TGeoTranslation(0., subStaveSizeY * 0.5, (j + 0.5) * moduleSizeZ + j * 0.02 - 0.5 * subStaveSizeZ);
subStaveVol->AddNode(moduleVol, 1 + j, translation);
}


// Now we build a stave from two substave
for (int i = 0; i < 2; ++i) {
LOGP(info, "oTOF: Creating substave {}/{} for stave {}/{}", i + 1, 2, 1, 1);
Expand Down
20 changes: 10 additions & 10 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/src/TF3Chip.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "DetectorsBase/MaterialManager.h"
#include "DetectorsBase/Detector.h"

#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for gGeoManager, TGeoManager
#include "TGeoVolume.h" // for TGeoVolume
#include "TGeoMatrix.h" // for TGeoMatrix
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for gGeoManager, TGeoManager
#include "TGeoVolume.h" // for TGeoVolume
#include "TGeoMatrix.h" // for TGeoMatrix
#include <fairlogger/Logger.h> // for LOG

namespace o2
Expand All @@ -31,11 +31,11 @@ const double TF3Chip::sChipSizeZ = 3.0; // cm

//________________________________________________________________________
TGeoVolume* TF3Chip::createChip(const Double_t ychip,
const Double_t ysens,
const char* chipName,
const char* sensName,
const Bool_t dummy,
const TGeoManager* mgr)
const Double_t ysens,
const char* chipName,
const char* sensName,
const Bool_t dummy,
const TGeoManager* mgr)
{

Double_t xchip, zchip;
Expand Down Expand Up @@ -141,5 +141,5 @@ void TF3Chip::createMaterials(Int_t id, Int_t ifield, Float_t fieldm)
}
}

} // namespace iofof
} // namespace iotof
} // namespace o2