Skip to content

Fix IB and OB geometry to latest blueprints #8358

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 2 commits into from
Mar 16, 2022
Merged

Fix IB and OB geometry to latest blueprints #8358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a13a304
Fix IB and OB geometry to latest blueprints
mario6829 Mar 15, 2022
3335d9c
Fix clang format
mario6829 Mar 15, 2022
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
10 changes: 5 additions & 5 deletions Detectors/ITSMFT/ITS/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ static void configITS(Detector* its)
{2.24, 2.34, 2.67, 9., 16.42, 12}, // for each inner layer: rMin,rMid,rMax,NChip/Stave, phi0, nStaves
{3.01, 3.15, 3.46, 9., 12.18, 16},
{3.78, 3.93, 4.21, 9., 9.55, 20},
{-1, 19.6, -1, 4., 7.5, 24}, // for others: -, rMid, -, NMod/HStave, phi0, nStaves // 24 was 49
{-1, 24.55, -1, 4., 6., 30}, // 30 was 61
{-1, 34.34, -1, 7., 4.29, 42}, // 42 was 88
{-1, 39.30, -1, 7., 3.75, 48} // 48 was 100
{-1, 19.45, -1, 4., 7.5, 24}, // for others: -, rMid, -, NMod/HStave, phi0, nStaves // 24 was 49
{-1, 24.40, -1, 4., 6., 30}, // 30 was 61
{-1, 34.24, -1, 7., 4.29, 42}, // 42 was 88
{-1, 39.20, -1, 7., 3.75, 48} // 48 was 100
};
const int nChipsPerModule = 7; // For OB: how many chips in a row
const double zChipGap = 0.01; // For OB: gap in Z between chips
Expand All @@ -117,7 +117,7 @@ static void configITS(Detector* its)
its->setStaveModelOB(o2::its::Detector::kOBModel2);

const int kNWrapVol = 3;
const double wrpRMin[kNWrapVol] = {2.1, 19.3, 33.32};
const double wrpRMin[kNWrapVol] = {2.1, 19.2, 33.32};
const double wrpRMax[kNWrapVol] = {15.4, 29.14, 44.9};
const double wrpZSpan[kNWrapVol] = {70., 93., 163.6};

Expand Down
10 changes: 5 additions & 5 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 @@ -54,8 +54,8 @@ const Int_t V3Layer::sIBNChipRows = 1;
const Double_t V3Layer::sIBChipZGap = 150.0 * sMicron;

const Double_t V3Layer::sIBModuleZLength = 27.12 * sCm;
const Double_t V3Layer::sIBFPCWiderXPlus = 850.0 * sMicron;
const Double_t V3Layer::sIBFPCWiderXNeg = 300.0 * sMicron;
const Double_t V3Layer::sIBFPCWiderXPlus = 950.0 * sMicron;
const Double_t V3Layer::sIBFPCWiderXNeg = 400.0 * sMicron;
const Double_t V3Layer::sIBFlexCableAlThick = 25.0 * sMicron;
const Double_t V3Layer::sIBFPCAlGNDWidth = (4.1 + 11.15) * sMm;
const Double_t V3Layer::sIBFPCAlAnodeWidth1 = 13.0 * sMm;
Expand Down Expand Up @@ -571,21 +571,21 @@ Double_t V3Layer::createStaveInnerB(TGeoVolume* mother, const TGeoManager* mgr)
// 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)));
mother->AddNode(chipVol, j, new TGeoCombiTrans(0, 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();
xpos = 0.5 * (xtot - xchip);
ypos += (ymod + yvol);
mother->AddNode(ibModule, 1, new TGeoTranslation(0, ypos, 0));
mother->AddNode(ibModule, 1, new TGeoTranslation(xpos, ypos, 0));
ytot += yvol;
}

Expand Down