Skip to content

Commit 9f3db5a

Browse files
committed
aluminium plates no longer needed
1 parent 0198c3f commit 9f3db5a

4 files changed

Lines changed: 1 addition & 131 deletions

File tree

Detectors/Upgrades/ALICE3/FD3/base/include/FD3Base/FD3BaseParam.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ struct FD3BaseParam : public o2::conf::ConfigurableParamHelper<FD3BaseParam> {
2929

3030
bool modules_extra = false; // switch for modules at z = +-4 m
3131

32-
bool plateBehindA = false;
33-
bool fullContainer = false;
34-
35-
float dzplate = 1.0f; // Aluminium plate width
36-
3732
O2ParamDef(FD3BaseParam, "FD3Base");
3833
};
3934

Detectors/Upgrades/ALICE3/FD3/simulation/include/FD3Simulation/Detector.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,14 @@ class Detector : public o2::base::DetImpl<Detector>
106106

107107
bool mExtra;
108108
unsigned int mNumberOfRings, mNumberOfRings_extra, mNumberOfSectors;
109-
float mDzScint, mDzPlate;
109+
float mDzScint;
110110

111111
std::vector<float> mRingSizes = {}, mRingSizes_extra = {};
112112

113113
float mEtaMax, mEtaMin;
114114
float mEtaMax_extra, mEtaMin_extra;
115115
float mZAC, mZAC_extra;
116116

117-
bool mPlateBehindA, mFullContainer;
118-
119117
void defineSensitiveVolumes();
120118
void definePassiveVolumes();
121119

Detectors/Upgrades/ALICE3/FD3/simulation/src/Detector.cxx

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ Detector::Detector(bool active)
7070
mExtra = baseParam.modules_extra;
7171

7272
mDzScint = baseParam.dzscint / 2;
73-
mDzPlate = baseParam.dzplate;
74-
75-
mPlateBehindA = baseParam.plateBehindA;
76-
mFullContainer = baseParam.fullContainer;
7773

7874
mZAC = baseParam.zmodAC;
7975
mZAC_extra = baseParam.zmodAC_extra;
@@ -89,7 +85,6 @@ Detector::Detector(bool active)
8985
float r = ringSize(mZAC_extra, eta);
9086
mRingSizes_extra.emplace_back(r);
9187
}
92-
9388
}
9489

9590
Detector::Detector(const Detector& rhs)
@@ -323,20 +318,6 @@ TGeoVolumeAssembly* Detector::buildModuleA()
323318
mod->AddNode(ring, ir + 1);
324319
}
325320

326-
// Aluminium plates on one or both sides of the A side module
327-
if (mPlateBehindA || mFullContainer) {
328-
LOG(info) << "adding container on A side";
329-
auto pmed = (TGeoMedium*)gGeoManager->GetMedium("FD3_Aluminium");
330-
auto pvol = new TGeoTube("pvol_fd3a", mRingSizes[0], mRingSizes[mNumberOfRings], mDzPlate);
331-
auto pnod1 = new TGeoVolume("pnod1_FD3A", pvol, pmed);
332-
double dpz = 2. + mDzPlate / 2;
333-
mod->AddNode(pnod1, 1, new TGeoTranslation(0, 0, dpz));
334-
335-
if (mFullContainer) {
336-
auto pnod2 = new TGeoVolume("pnod2_FD3A", pvol, pmed);
337-
mod->AddNode(pnod2, 1, new TGeoTranslation(0, 0, -dpz));
338-
}
339-
}
340321
return mod;
341322
}
342323

@@ -371,19 +352,6 @@ TGeoVolumeAssembly* Detector::buildModuleC()
371352
mod->AddNode(ring, ir + 1);
372353
}
373354

374-
// Aluminium plates on both sides of the C side module
375-
if (mFullContainer) {
376-
LOG(info) << "adding container on C side";
377-
auto pmed = (TGeoMedium*)gGeoManager->GetMedium("FD3_Aluminium");
378-
auto pvol = new TGeoTube("pvol_fd3c", mRingSizes[0], mRingSizes[mNumberOfRings], mDzPlate);
379-
auto pnod1 = new TGeoVolume("pnod1_FD3C", pvol, pmed);
380-
auto pnod2 = new TGeoVolume("pnod2_FD3C", pvol, pmed);
381-
double dpz = mDzScint / 2 + mDzPlate / 2;
382-
383-
mod->AddNode(pnod1, 1, new TGeoTranslation(0, 0, dpz));
384-
mod->AddNode(pnod2, 2, new TGeoTranslation(0, 0, -dpz));
385-
}
386-
387355
return mod;
388356
}
389357

Detectors/Upgrades/ALICE3/macros/ALICE3FieldV3Magnet.C

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)