Skip to content

Please consider the following formatting changes to #15652 #4

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

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #15652 #4

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
27 changes: 13 additions & 14 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 @@ -3490,7 +3490,7 @@ TGeoVolume* V3Layer::createModuleOuterB(const TGeoManager* mgr)
Double_t ysig = (static_cast<TGeoBBox*>(cuSignalCableVol->GetShape()))->GetDY();

xlen = (static_cast<TGeoBBox*>(cuGndCableVol->GetShape()))->GetDX();
// ylen = glueCP->GetDY() + ychip + glueFPC->GetDY() + ysig + flexKap->GetDY() + ygnd;
// ylen = glueCP->GetDY() + ychip + glueFPC->GetDY() + ysig + flexKap->GetDY() + ygnd;
ylen = glueCP->GetDY() + ychip + glueFPC->GetDY() + ysig + flexKap->GetDY() + ygnd + sOBFPCCapacitorYHi / 2;
TGeoBBox* module = new TGeoBBox("OBModule", xlen, ylen, zlen);

Expand Down Expand Up @@ -3690,29 +3690,28 @@ void V3Layer::createOBFPCCapacitors(TGeoVolume* modvol, Double_t xmodlen, Double
// will be translated to TGeo Z,X with respect center of module)
const Int_t nGroups = 10;
const Double_t xyCapacitors[nGroups][2] = {
{26.34 * sMm, 14.02 * sMm}, {7.16 * sMm, 18.96 * sMm},
{26.04 * sMm, 10.34 * sMm}, {7.91 * sMm, 22.67 * sMm},
{41.36 * sMm, 18.78 * sMm}, {41.56 * sMm, 14.23 * sMm},
{64.35 * sMm, 13.54 * sMm}, {25.95 * sMm, 19.38 * sMm},
{64.39 * sMm, 10.45 * sMm}, {22.21 * sMm, 22.63 * sMm}
};
{26.34 * sMm, 14.02 * sMm}, {7.16 * sMm, 18.96 * sMm}, {26.04 * sMm, 10.34 * sMm}, {7.91 * sMm, 22.67 * sMm}, {41.36 * sMm, 18.78 * sMm}, {41.56 * sMm, 14.23 * sMm}, {64.35 * sMm, 13.54 * sMm}, {25.95 * sMm, 19.38 * sMm}, {64.39 * sMm, 10.45 * sMm}, {22.21 * sMm, 22.63 * sMm}};

const Double_t deltaYCapacitors = 30 * sMm;

const Int_t nCapacitors[nGroups] = {7, 7, 7, 7, 5, 5, 5, 7, 5, 7};

const Double_t xyCapacitorSingle[8][2] = {
{14.91 * sMm, 18.78 * sMm}, {195.81 * sMm, 18.78 * sMm},
{15.11 * sMm, 14.23 * sMm}, {196.01 * sMm, 14.23 * sMm},
{34.20 * sMm, 13.54 * sMm}, {36.59 * sMm, 10.33 * sMm},
{7.73 * sMm, 13.54 * sMm}, {11.44 * sMm, 12.13 * sMm},
{14.91 * sMm, 18.78 * sMm},
{195.81 * sMm, 18.78 * sMm},
{15.11 * sMm, 14.23 * sMm},
{196.01 * sMm, 14.23 * sMm},
{34.20 * sMm, 13.54 * sMm},
{36.59 * sMm, 10.33 * sMm},
{7.73 * sMm, 13.54 * sMm},
{11.44 * sMm, 12.13 * sMm},
};

// Local variables
Double_t xpos, ypos, zpos;
Int_t idCapacitor;

TGeoVolume *capacitorOB;
TGeoVolume* capacitorOB;

// Check whether we already have the volumes, otherwise create them
// (so as to avoid creating multiple copies of the very same volumes
Expand All @@ -3732,7 +3731,7 @@ void V3Layer::createOBFPCCapacitors(TGeoVolume* modvol, Double_t xmodlen, Double
// Place all the capacitors (they are really a lot...)
ypos = yzero + sOBFPCCapacitorYHi / 2;
idCapacitor = 0;

for (Int_t jgrp = 0; jgrp < nGroups; jgrp++) { // Loop on the groups of cap's
xpos = xyCapacitors[jgrp][1] - xmodlen;
for (Int_t jcap = 0; jcap < nCapacitors[jgrp]; jcap++) { // Loop on cap's
Expand All @@ -3748,7 +3747,7 @@ void V3Layer::createOBFPCCapacitors(TGeoVolume* modvol, Double_t xmodlen, Double
zpos = xyCapacitorSingle[jcap][0] - zmodlen;
idCapacitor++;
modvol->AddNode(capacitorOB, idCapacitor, new TGeoTranslation(xpos, ypos, zpos));
}
}

// We've done
}
Expand Down