Skip to content

Remove fake IB HalfStave and Module volumes #6011

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
shahor02 merged 5 commits into from
May 24, 2021
Merged

Remove fake IB HalfStave and Module volumes #6011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef95313
Remove fake IB HalfStave and Module volumes
Apr 27, 2021
7bd4406
Change IB service container name (to avoid "Module")
May 7, 2021
e772ea6
Adding dummy commit to trigger anothe CI check
shahor02 May 10, 2021
7c21884
RecoGeomHelper: Fix calculation of nLadders on inner layers
shahor02 May 14, 2021
f7b0029
Fix getChipIndex for inner layers
shahor02 May 17, 2021
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
18 changes: 11 additions & 7 deletions Detectors/ITSMFT/ITS/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,18 @@ int GeometryTGeo::getChipIndex(int lay, int sta, int substa, int chipInSStave) c
//__________________________________________________________________________
int GeometryTGeo::getChipIndex(int lay, int sta, int substa, int md, int chipInMod) const
{
int n = getFirstChipIndex(lay) + mNumberOfChipsPerStave[lay] * sta + chipInMod;
if (mNumberOfHalfStaves[lay] && substa > 0) {
n += mNumberOfChipsPerHalfStave[lay] * substa;
}
if (mNumberOfModules[lay] && md > 0) {
n += mNumberOfChipsPerModule[lay] * md;
if (mNumberOfHalfStaves[lay] == 0) {
return getChipIndex(lay, md, chipInMod);
} else {
int n = getFirstChipIndex(lay) + mNumberOfChipsPerStave[lay] * sta + chipInMod;
if (mNumberOfHalfStaves[lay] && substa > 0) {
n += mNumberOfChipsPerHalfStave[lay] * substa;
}
if (mNumberOfModules[lay] && md > 0) {
n += mNumberOfChipsPerModule[lay] * md;
}
return n;
}
return n;
}

//__________________________________________________________________________
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/reconstruction/src/RecoGeomHelper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void RecoGeomHelper::RecoLayer::init()
float dzH = o2::itsmft::SegmentationAlpide::SensorSizeCols / 2; // half width in Z
int nCh = gm->getNumberOfChipsPerLayer(id), chip0 = gm->getFirstChipIndex(id);
int nChMod = gm->getNumberOfChipsPerModule(id), nChModH = nChMod / 2;
nLadders = nStaves * nHStaves * (id > 2 ? 2 : 1); // 2 ladders per h-stave for OB
nLadders = nHStaves > 1 ? nStaves * nHStaves * 2 : nStaves; // 2 ladders per h-stave for OB
ladders.resize(nLadders);

for (auto lad : ladders) {
Expand Down
15 changes: 9 additions & 6 deletions Detectors/ITSMFT/ITS/simulation/include/ITSSimulation/V3Layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace its
{

/// This class defines the Geometry for the ITS using TGeo. This is a work class used
/// to study different configurations during the development of the new ITS structure
/// to study different configurations during the development of the new ITS structure.
class V3Layer : public V11Geometry
{

Expand Down Expand Up @@ -161,10 +161,12 @@ class V3Layer : public V11Geometry
/// \param mgr The GeoManager (used only to get the proper material)
TGeoVolume* createStave(const TGeoManager* mgr = gGeoManager);

/// Creates the IB Module: (only the chips for the time being)
/// Creates the IB Module: all elements except the Chip
/// Returns the module as a TGeoVolume
/// \param xchip the Chip width
/// \param zchip the Chip length
/// \param mgr The GeoManager (used only to get the proper material)
TGeoVolume* createModuleInnerB(const TGeoManager* mgr = gGeoManager);
TGeoVolume* createModuleInnerB(const Double_t xchip, const Double_t zchip, const TGeoManager* mgr = gGeoManager);

/// Creates the OB Module: HIC + FPC + Carbon plate
/// Returns the module as a TGeoVolume
Expand All @@ -190,10 +192,11 @@ class V3Layer : public V11Geometry
/// \param mgr The GeoManager (used only to get the proper material)
void createIBCapacitors(TGeoVolume* modvol, Double_t zchip, Double_t yzero, const TGeoManager* mgr = gGeoManager);

/// Create the chip stave for the Inner Barrel(Here we fake the halfstave volume to have the
/// same formal geometry hierarchy as for the Outer Barrel)
/// Create the chip stave for the Inner Barrel
/// Returns the old "module" thickness
/// \param mother The mother volume
/// \param mgr The GeoManager (used only to get the proper material)
TGeoVolume* createStaveInnerB(const TGeoManager* mgr = gGeoManager);
Double_t createStaveInnerB(TGeoVolume* mother, const TGeoManager* mgr = gGeoManager);

/// Create the mechanical stave structure
/// \param mgr The GeoManager (used only to get the proper material)
Expand Down
147 changes: 79 additions & 68 deletions Detectors/ITSMFT/ITS/simulation/src/V3Layer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,12 +447,13 @@ TGeoVolume* V3Layer::createStave(const TGeoManager* /*mgr*/)
// Updated: 16 Mar 2017 Mario Sitta AliceO2 version
// Updated: 10 Jan 2018 Mario Sitta Compute all dimensions using
// AlpideChip as basis
// Updated: 10 Mar 2021 Mario Sitta Get rid of fake IB HS and Module
//

const Int_t nameLen = 30;
char volumeName[nameLen];

Double_t xpos, ypos;
Double_t xpos, ypos, ymod;
Double_t alpha;

// First create all needed shapes
Expand All @@ -468,15 +469,15 @@ TGeoVolume* V3Layer::createStave(const TGeoManager* /*mgr*/)

// Now build up the stave
if (mLayerNumber < sNumberOfInnerLayers) {
TGeoVolume* modVol = createStaveInnerB();
ypos = (static_cast<TGeoBBox*>(modVol->GetShape()))->GetDY() - mChipThickness; // = 0 if not kIBModel4
staveVol->AddNode(modVol, 0, new TGeoTranslation(0, ypos, 0));
mHierarchy[kHalfStave] = 1;
ymod = createStaveInnerB(staveVol);
ypos = ymod - mChipThickness; // = 0 if not kIBModel4
mHierarchy[kHalfStave] = 0;
mHierarchy[kModule] = 0;

// Mechanical stave structure
mechStaveVol = createStaveStructInnerB();
if (mechStaveVol) {
ypos = (static_cast<TGeoBBox*>(modVol->GetShape()))->GetDY() - ypos;
ypos = ymod - ypos;
if (mStaveModel != Detector::kIBModel4) {
ypos += (static_cast<TGeoBBox*>(mechStaveVol->GetShape()))->GetDY();
}
Expand Down Expand Up @@ -511,36 +512,7 @@ TGeoVolume* V3Layer::createStave(const TGeoManager* /*mgr*/)
return staveVol;
}

TGeoVolume* V3Layer::createStaveInnerB(const TGeoManager* mgr)
{
Double_t xmod, ymod, zmod;
const Int_t nameLen = 30;
char volumeName[nameLen];

// First we create the module (i.e. the HIC with 9 chips)
TGeoVolume* moduleVol = createModuleInnerB();

// Then we create the fake halfstave and the actual stave
xmod = (static_cast<TGeoBBox*>(moduleVol->GetShape()))->GetDX();
ymod = (static_cast<TGeoBBox*>(moduleVol->GetShape()))->GetDY();
zmod = (static_cast<TGeoBBox*>(moduleVol->GetShape()))->GetDZ();

TGeoBBox* hstave = new TGeoBBox(xmod, ymod, zmod);

TGeoMedium* medAir = mgr->GetMedium("ITS_AIR$");

snprintf(volumeName, nameLen, "%s%d", GeometryTGeo::getITSHalfStavePattern(), mLayerNumber);
TGeoVolume* hstaveVol = new TGeoVolume(volumeName, hstave, medAir);

// Finally build it up
hstaveVol->AddNode(moduleVol, 0);
mHierarchy[kModule] = 1;

// Done, return the stave structure
return hstaveVol;
}

TGeoVolume* V3Layer::createModuleInnerB(const TGeoManager* mgr)
Double_t V3Layer::createStaveInnerB(TGeoVolume* mother, const TGeoManager* mgr)
{
Double_t xtot, ytot, ztot, xchip, zchip, ymod;
Double_t xpos, ypos, zpos;
Expand Down Expand Up @@ -568,7 +540,61 @@ TGeoVolume* V3Layer::createModuleInnerB(const TGeoManager* mgr)

mIBModuleZLength = 2 * zchip * sIBChipsPerRow + (sIBChipsPerRow - 1) * sIBChipZGap;

// Then create the Glue, the Kapton and the two Aluminum cables
xtot = xchip + (sIBFPCWiderXPlus + sIBFPCWiderXNeg) / 2;
ztot = mIBModuleZLength / 2;

// Then create all other elements (glue and FPC)
TGeoVolume* ibModule = createModuleInnerB(xchip, zchip);

// Build up the stave
// Chips are rotated by 180deg around Y axis
// in order to have the correct X and Z axis orientation
xpos = -xtot + (static_cast<TGeoBBox*>(chipVol->GetShape()))->GetDX() + sIBFPCWiderXNeg;
ypos = ymod - mChipThickness;

for (Int_t j = 0; j < sIBChipsPerRow; j++) {
zpos = ztot - j * (2 * zchip + sIBChipZGap) - zchip;
mother->AddNode(chipVol, j, new TGeoCombiTrans(xpos, ypos, zpos, new TGeoRotation("", 0, 180, 180)));
mHierarchy[kChip]++;
}
ytot = ymod;

// Place the FPC and glue
if (mStaveModel == Detector::kIBModel4) {
Double_t yvol = (static_cast<TGeoBBox*>(ibModule->GetShape()))->GetDY();
ypos += (ymod + yvol);
mother->AddNode(ibModule, 1, new TGeoTranslation(0, ypos, 0));
ytot += yvol;
}

// Done, return the total thickness (used to properly place the services)
return ytot;
}

TGeoVolume* V3Layer::createModuleInnerB(const Double_t xchip, const Double_t zchip, const TGeoManager* mgr)
{
//
// Creates the FPC and glue volumes
// (zimilar to previous method, except the Chips)
//
// Input:
// xchip : the Chip width
// zchip : the Chip length
// mgr : the GeoManager (used only to get the proper material)
//
// Output:
//
// Return:
// the module as a TGeoVolume
//
// Updated: 03 Apr 2021

Double_t xtot, ytot, ztot;
Double_t xpos, ypos, zpos;
const Int_t nameLen = 30;
char volumeName[nameLen];

// Create the Glue, the Kapton and the two Aluminum cables
xtot = xchip + (sIBFPCWiderXPlus + sIBFPCWiderXNeg) / 2;
ztot = mIBModuleZLength / 2;

Expand All @@ -578,15 +604,11 @@ TGeoVolume* V3Layer::createModuleInnerB(const TGeoManager* mgr)
TGeoVolume* aluGndCableVol = createIBFPCAlGnd(xtot, ztot);
TGeoVolume* aluAnodeCableVol = createIBFPCAlAnode(xtot, ztot);

// Finally create the module and populate it with the chips
// (and the FPC Kapton and Aluminum in the most recent IB model)
// Then create the module volume
Double_t ygnd = (static_cast<TGeoBBox*>(aluGndCableVol->GetShape()))->GetDY();
Double_t yano = (static_cast<TGeoBBox*>(aluAnodeCableVol->GetShape()))->GetDY();

ytot = ymod;
if (mStaveModel == Detector::kIBModel4) {
ytot += (sIBGlueThick / 2 + ygnd + sIBFlexCableKapThick / 2 + yano + sIBFlexCapacitorYHi / 2);
}
ytot = sIBGlueThick / 2 + ygnd + sIBFlexCableKapThick / 2 + yano + sIBFlexCapacitorYHi / 2;

TGeoBBox* module = new TGeoBBox(xtot, ytot, ztot);

Expand All @@ -595,7 +617,7 @@ TGeoVolume* V3Layer::createModuleInnerB(const TGeoManager* mgr)
TGeoMedium* medKapton = mgr->GetMedium("ITS_KAPTON(POLYCH2)$");
TGeoMedium* medGlue = mgr->GetMedium("ITS_GLUE_IBFPC$");

snprintf(volumeName, nameLen, "%s%d", GeometryTGeo::getITSModulePattern(), mLayerNumber);
snprintf(volumeName, nameLen, "ServicesContainer%d", mLayerNumber);
TGeoVolume* modVol = new TGeoVolume(volumeName, module, medAir);

TGeoVolume* glueVol = new TGeoVolume("FPCGlue", glue, medGlue);
Expand All @@ -607,35 +629,24 @@ TGeoVolume* V3Layer::createModuleInnerB(const TGeoManager* mgr)
kapCableVol->SetFillColor(kBlue);

// Build up the module
// Chips are rotated by 180deg around Y axis
// in order to have the correct X and Z axis orientation
xpos = -xtot + (static_cast<TGeoBBox*>(chipVol->GetShape()))->GetDX() + sIBFPCWiderXNeg;
ypos = -ytot + ymod; // = 0 if not kIBModel4
for (Int_t j = 0; j < sIBChipsPerRow; j++) {
zpos = ztot - j * (2 * zchip + sIBChipZGap) - zchip;
modVol->AddNode(chipVol, j, new TGeoCombiTrans(xpos, ypos, zpos, new TGeoRotation("", 0, 180, 180)));
mHierarchy[kChip]++;
xpos = -xtot + xchip + sIBFPCWiderXNeg;
ypos = -ytot + glue->GetDY();
if (mBuildLevel < 2) { // Glue
modVol->AddNode(glueVol, 1, new TGeoTranslation(xpos, ypos, 0));
}
ypos += glue->GetDY();

if (mStaveModel == Detector::kIBModel4) {
ypos += (ymod + glue->GetDY());
if (mBuildLevel < 2) { // Glue
modVol->AddNode(glueVol, 1, new TGeoTranslation(xpos, ypos, 0));
}
ypos += glue->GetDY();

if (mBuildLevel < 4) { // Kapton
ypos += ygnd;
modVol->AddNode(aluGndCableVol, 1, new TGeoTranslation(0, ypos, 0));
if (mBuildLevel < 4) { // Kapton
ypos += ygnd;
modVol->AddNode(aluGndCableVol, 1, new TGeoTranslation(0, ypos, 0));

ypos += (ygnd + kapCable->GetDY());
modVol->AddNode(kapCableVol, 1, new TGeoTranslation(0, ypos, 0));
ypos += (ygnd + kapCable->GetDY());
modVol->AddNode(kapCableVol, 1, new TGeoTranslation(0, ypos, 0));

ypos += (kapCable->GetDY() + yano);
modVol->AddNode(aluAnodeCableVol, 1, new TGeoTranslation(0, ypos, 0));
ypos += (kapCable->GetDY() + yano);
modVol->AddNode(aluAnodeCableVol, 1, new TGeoTranslation(0, ypos, 0));

ypos += yano;
}
ypos += yano;
}

// Add the capacitors
Expand Down