Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const std::vector<double> x_midpoints = {
38.25, 42.75, 47.25, 51.75, 56.25, 60.75, 65.25 // R
};
const double x_midpoint_spacing = 4.5; // assume constant for now
const double maxToleranceInner = 0.; // default not allowed inwards
const double maxToleranceInner = 0.; // default not allowed inwards
const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation
const std::vector<bool> staveOnFront =
{
Expand All @@ -180,8 +180,8 @@ const std::vector<double> x_midpoints = {
2.25, 6.75, 11.25, 15.75, 20.25, 24.75, 29.25, 33.75 // R
};
const double x_midpoint_spacing = 4.5;
const double maxToleranceInner = 0.; // default not allowed inwards
const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation
const double maxToleranceInner = 0.; // default not allowed inwards
const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation
const std::vector<bool> staveOnFront =
{
1, 0, 1, 0, 1, 0, 1, 0, // L
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)

// shift stave volumes into layer volume, since nominal z_{stave face} = 0
double z_local_offset = z_layer_thickness / 2.0;
// ensure staves fully encapsulated in the layer volume,
// but don't cross out of max nominal radii of 38.5cm & 71.5cm respectively (3.5cm tolerance)
// ensure staves fully encapsulated in the layer volume,
// but don't cross out of max nominal radii of 38.5cm & 71.5cm respectively (3.5cm tolerance)
TGeoTube* layer = new TGeoTube(mInnerRadius - 0.2, mOuterRadius + 3.49, z_layer_thickness / 2);
layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);

Expand Down
21 changes: 6 additions & 15 deletions Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,7 @@ void FT3Module::create_layout_staveGeo(double mZ, int layerNumber, int direction
// each entry is a vector, where each entry is the number of modules of that stack height
std::vector<std::vector<unsigned>> nSensorStackCountPerStave(
staveConfig.x_midpoints.size(),
std::vector<unsigned>(Constants::kSensorsPerStack.size(), 0)
);
std::vector<unsigned>(Constants::kSensorsPerStack.size(), 0));
std::vector<unsigned> nSensorStackTotal(Constants::kSensorsPerStack.size(), 0);
for (unsigned i_stave = 0; i_stave < staveConfig.x_midpoints.size(); i_stave++) {
y_positionsPosNeg.emplace_back(PosNegPositionTypes{PositionTypes{}, PositionTypes{}});
Expand Down Expand Up @@ -669,33 +668,25 @@ void FT3Module::create_layout_staveGeo(double mZ, int layerNumber, int direction

// now add the sensor positions on the stave
for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) {
unsigned nModulesCurr = y_positionsPosNeg.back().first.size()
+ y_positionsPosNeg.back().second.size();
unsigned nModulesCurr = y_positionsPosNeg.back().first.size() + y_positionsPosNeg.back().second.size();
fill_stave(y_positionsPosNeg.back(), Rin, Rout, x_left,
Constants::kSensorsPerStack[i_kSens], y_ranges,
absAllowedYRange);
unsigned nModulesAdded = y_positionsPosNeg.back().first.size()
+ y_positionsPosNeg.back().second.size()
- nModulesCurr;
unsigned nModulesAdded = y_positionsPosNeg.back().first.size() + y_positionsPosNeg.back().second.size() - nModulesCurr;
nSensorStackCountPerStave[i_stave][i_kSens] = nModulesAdded;
nSensorStackTotal[i_kSens] += nModulesAdded;
}
std::string moduleDebugStr = "Module size counts for layer " + std::to_string(layerNumber)
+ " in direction " + std::to_string(direction) + ":\n";
std::string moduleDebugStr = "Module size counts for layer " + std::to_string(layerNumber) + " in direction " + std::to_string(direction) + ":\n";
for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) {
moduleDebugStr += "\t" + std::to_string(nSensorStackCountPerStave[i_stave][i_kSens])
+ " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens])
+ " sensors stacked\n";
moduleDebugStr += "\t" + std::to_string(nSensorStackCountPerStave[i_stave][i_kSens]) + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) + " sensors stacked\n";
}
LOG(debug) << moduleDebugStr;
}
std::string totalModuleInfoStr =
"Total module size counts for layer " + std::to_string(layerNumber) +
" in direction " + std::to_string(direction) + ":\n";
for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) {
totalModuleInfoStr += "\t" + std::to_string(nSensorStackTotal[i_kSens])
+ " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens])
+ " sensors stacked\n";
totalModuleInfoStr += "\t" + std::to_string(nSensorStackTotal[i_kSens]) + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) + " sensors stacked\n";
}
LOG(info) << totalModuleInfoStr;

Expand Down