// (Originally defined in AliMUONv2.cxx - now removed.)
// Included in AliRoot 2004/01/23
-#ifdef ST1_WITH_STL
- #include <vector>
-#endif
-
-#ifdef ST1_WITH_ROOT
- #include "TArrayI.h"
-#endif
-
-#include <TVector2.h>
-#include <TVector3.h>
-#include <TGeoMatrix.h>
-#include <TClonesArray.h>
-#include <Riostream.h>
-#include <TSystem.h>
-#include <TVirtualMC.h>
+#include "AliMUONSt1GeometryBuilderV2.h"
+#include "AliMUONSt1SpecialMotif.h"
+#include "AliMUON.h"
+#include "AliMUONConstants.h"
+#include "AliMUONGeometryModule.h"
+#include "AliMUONGeometryEnvelopeStore.h"
+#include "AliMpContainers.h"
+#include "AliMpConstants.h"
#include "AliMpFiles.h"
-#include "AliMpReader.h"
+#include "AliMpSectorReader.h"
#include "AliMpSector.h"
#include "AliMpRow.h"
#include "AliMpVRowSegment.h"
#include "AliMpMotifMap.h"
#include "AliMpMotifPosition.h"
+#include "AliMpPlaneType.h"
#include "AliRun.h"
#include "AliMagF.h"
#include "AliLog.h"
-#include "AliMUONSt1GeometryBuilderV2.h"
-#include "AliMUONSt1SpecialMotif.h"
-#include "AliMUON.h"
-#include "AliMUONChamber.h"
-#include "AliMUONGeometryModule.h"
-#include "AliMUONGeometryEnvelopeStore.h"
+#include <TVector2.h>
+#include <TVector3.h>
+#include <TGeoMatrix.h>
+#include <TClonesArray.h>
+#include <Riostream.h>
+#include <TSystem.h>
+#include <TVirtualMC.h>
+#include <TGeoManager.h>
+#include <TGeoVolume.h>
+#include <TGeoTube.h>
+#include <TGeoCompositeShape.h>
-ClassImp(AliMUONSt1GeometryBuilderV2)
+#ifdef WITH_STL
+ #include <vector>
+#endif
+
+#ifdef WITH_ROOT
+ #include "TArrayI.h"
+#endif
// Thickness Constants
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzPadPlane=0.0148/2.; //Pad plane
-const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzFoam = 2.083/2.; //Foam of mechanicalplane
-const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzFR4 = 0.0031/2.; //FR4 of mechanical plane
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzFoam = 2.503/2.; //Foam of mechanicalplane
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzFR4 = 0.062/2.; //FR4 of mechanical plane
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzSnPb = 0.0091/2.; //Pad/Kapton connection (66 pt)
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzKapton = 0.0122/2.; //Kapton
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzBergPlastic = 0.3062/2.;//Berg connector
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzBergCopper = 0.1882/2.; //Berg connector
const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzDaughter = 0.0156/2.; //Daughter board
-const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzGas = 0.2/2.; //Gas thickness
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkHzGas = 0.42/2.; //Gas thickness
// Quadrant Mother volume - TUBS1 - Middle layer of model
const GReal_t AliMUONSt1GeometryBuilderV2::fgkMotherIR1 = 18.3;
const GReal_t AliMUONSt1GeometryBuilderV2::fgkDeltaFilleEtamY=0.051;
const GReal_t AliMUONSt1GeometryBuilderV2::fgkDeltaQuadLHC=2.6; // LHC Origin wrt Quadrant Origin
-const GReal_t AliMUONSt1GeometryBuilderV2::fgkFrameOffset=5.0;
-
-const char* AliMUONSt1GeometryBuilderV2::fgkHoleName="MCHL";
-const char* AliMUONSt1GeometryBuilderV2::fgkDaughterName="MCDB";
-const char AliMUONSt1GeometryBuilderV2::fgkFoamLayerSuffix='F'; // prefix for automatic volume naming
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkFrameOffset=5.2;
+ // Fix (1) of overlap SQN* layers with SQM* ones (was 5.0)
+
+// Pad planes offsets
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkPadXOffsetBP = 0.50 - 0.63/2; // = 0.185
+const GReal_t AliMUONSt1GeometryBuilderV2::fgkPadYOffsetBP = -0.31 - 0.42/2; // =-0.52
+
+const char* AliMUONSt1GeometryBuilderV2::fgkHoleName="SCHL";
+const char* AliMUONSt1GeometryBuilderV2::fgkDaughterName="SCDB";
+const char* AliMUONSt1GeometryBuilderV2::fgkQuadrantEnvelopeName="SE";
const char* AliMUONSt1GeometryBuilderV2::fgkQuadrantMLayerName="SQM";
const char* AliMUONSt1GeometryBuilderV2::fgkQuadrantNLayerName="SQN";
const char* AliMUONSt1GeometryBuilderV2::fgkQuadrantFLayerName="SQF";
+const Int_t AliMUONSt1GeometryBuilderV2::fgkFoamBoxNameOffset=200;
+const Int_t AliMUONSt1GeometryBuilderV2::fgkFR4BoxNameOffset=400;
const Int_t AliMUONSt1GeometryBuilderV2::fgkDaughterCopyNoOffset=1000;
+ClassImp(AliMUONSt1GeometryBuilderV2)
+
//______________________________________________________________________________
AliMUONSt1GeometryBuilderV2::AliMUONSt1GeometryBuilderV2(AliMUON* muon)
- : AliMUONVGeometryBuilder("st1V2.dat",
- muon->Chamber(0).GetGeometry(),
- muon->Chamber(1).GetGeometry()),
+ : AliMUONVGeometryBuilder(0, 1),
fMUON(muon)
{
// set path to mapping data files
if (! gSystem->Getenv("MINSTALL")) {
TString dirPath = gSystem->Getenv("ALICE_ROOT");
dirPath += "/MUON/mapping";
- AliMpFiles::Instance()->SetTopPath(dirPath);
+ AliMpFiles::SetTopPath(dirPath);
gSystem->Setenv("MINSTALL", dirPath.Data());
//cout << "AliMpFiles top path set to " << dirPath << endl;
}
// Private methods
//
+//______________________________________________________________________________
+TString
+AliMUONSt1GeometryBuilderV2::QuadrantEnvelopeName(Int_t chamber, Int_t quadrant) const
+{
+// Generate unique envelope name from chamber Id and quadrant number
+// ---
+
+ return Form("%s%d", Form("%s%d",fgkQuadrantEnvelopeName,chamber), quadrant);
+}
+
//______________________________________________________________________________
void AliMUONSt1GeometryBuilderV2::CreateHole()
{
par[0] = fgkHxHole;
par[1] = fgkHyBergPlastic;
par[2] = fgkHzKapton;
- gMC->Gsvolu("KAPT", "BOX", idCopper, par, 3);
+ gMC->Gsvolu("SKPT", "BOX", idCopper, par, 3);
posX = 0.;
posY = 0.;
posZ = 0.;
- gMC->Gspos("KAPT",1,fgkHoleName, posX, posY, posZ, 0,"ONLY");
+ gMC->Gspos("SKPT",1,fgkHoleName, posX, posY, posZ, 0,"ONLY");
}
//______________________________________________________________________________
par[0]=fgkHxBergPlastic;
par[1]=fgkHyBergPlastic;
par[2]=fgkHzBergPlastic;
- gMC->Gsvolu("BRGP","BOX",idPlastic,par,3);
+ gMC->Gsvolu("SBGP","BOX",idPlastic,par,3);
posX=0.;
posY=0.;
posZ = -TotalHzDaughter() + fgkHzBergPlastic;
- gMC->Gspos("BRGP",1,fgkDaughterName,posX,posY,posZ,0,"ONLY");
+ gMC->Gspos("SBGP",1,fgkDaughterName,posX,posY,posZ,0,"ONLY");
par[0]=fgkHxBergCopper;
par[1]=fgkHyBergCopper;
par[2]=fgkHzBergCopper;
- gMC->Gsvolu("BRGC","BOX",idCopper,par,3);
+ gMC->Gsvolu("SBGC","BOX",idCopper,par,3);
posX=0.;
posY=0.;
posZ=0.;
- gMC->Gspos("BRGC",1,"BRGP",posX,posY,posZ,0,"ONLY");
+ gMC->Gspos("SBGC",1,"SBGP",posX,posY,posZ,0,"ONLY");
par[0]=fgkHxDaughter;
par[1]=fgkHyDaughter;
par[2]=fgkHzDaughter;
- gMC->Gsvolu("DGHT","BOX",idCopper,par,3);
+ gMC->Gsvolu("SDGH","BOX",idCopper,par,3);
posX=0.;
posY=0.;
posZ = -TotalHzDaughter() + 2.*fgkHzBergPlastic + fgkHzDaughter;
- gMC->Gspos("DGHT",1,fgkDaughterName,posX,posY,posZ,0,"ONLY");
+ gMC->Gspos("SDGH",1,fgkDaughterName,posX,posY,posZ,0,"ONLY");
}
//______________________________________________________________________________
CreateFrame(chamber);
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
SpecialMap specialMap;
specialMap[76] = AliMUONSt1SpecialMotif(TVector2( 0.1, 0.84), 90.);
specialMap[75] = AliMUONSt1SpecialMotif(TVector2( 0.5, 0.36));
specialMap[47] = AliMUONSt1SpecialMotif(TVector2(1.01, 0.36));
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
SpecialMap specialMap;
specialMap.Add(76, (Long_t) new AliMUONSt1SpecialMotif(TVector2( 0.1, 0.84), 90.));
specialMap.Add(75, (Long_t) new AliMUONSt1SpecialMotif(TVector2( 0.5, 0.36)));
specialMap.Add(47, (Long_t) new AliMUONSt1SpecialMotif(TVector2(1.01, 0.36)));
#endif
- AliMpReader reader1(kStation1, kBendingPlane);
+ AliMpSectorReader reader1(kStation1, kBendingPlane);
AliMpSector* sector1 = reader1.BuildSector();
- Bool_t reflectZ = true;
- TVector3 where = TVector3(2.5+0.1+0.56+0.001, 2.5+0.1+0.001, 0.);
+ //Bool_t reflectZ = true;
+ Bool_t reflectZ = false;
+ //TVector3 where = TVector3(2.5+0.1+0.56+0.001, 2.5+0.1+0.001, 0.);
+ TVector3 where = TVector3(fgkDeltaQuadLHC + fgkPadXOffsetBP,
+ fgkDeltaQuadLHC + fgkPadYOffsetBP, 0.);
PlaceSector(sector1, specialMap, where, reflectZ, chamber);
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
specialMap.clear();
specialMap[76] = AliMUONSt1SpecialMotif(TVector2(1.01,0.59),90.);
specialMap[75] = AliMUONSt1SpecialMotif(TVector2(1.96, 0.17));
- specialMap[47] = AliMUONSt1SpecialMotif(TVector2(1.61,-1.18));
+ specialMap[47] = AliMUONSt1SpecialMotif(TVector2(2.18,-0.98));
specialMap[20] = AliMUONSt1SpecialMotif(TVector2(0.2 ,-0.08));
specialMap[46] = AliMUONSt1SpecialMotif(TVector2(0.2 , 0.25));
specialMap[74] = AliMUONSt1SpecialMotif(TVector2(0.28, 0.21));
+ // Fix (7) - overlap of SQ42 with MCHL (after moving the whole sector
+ // in the true position)
+ // Was: specialMap[47] = AliMUONSt1SpecialMotif(TVector2(1.61,-1.18));
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
+ Int_t nb = AliMpConstants::ManuMask(kNonBendingPlane);
specialMap.Delete();
- specialMap.Add(76,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.01,0.59),90.));
- specialMap.Add(75,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.96, 0.17)));
- specialMap.Add(47,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.61,-1.18)));
- specialMap.Add(20,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.2 ,-0.08)));
- specialMap.Add(46,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.2 , 0.25)));
- specialMap.Add(74,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.28, 0.21)));
+ specialMap.Add(76 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.01,0.59),90.));
+ specialMap.Add(75 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.96, 0.17)));
+ specialMap.Add(47 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(2.18,-0.98)));
+ specialMap.Add(20 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.2 ,-0.08)));
+ specialMap.Add(46 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.2 , 0.25)));
+ specialMap.Add(74 | nb,(Long_t) new AliMUONSt1SpecialMotif(TVector2(0.28, 0.21)));
+ // Fix (7) - overlap of SQ42 with MCHL (after moving the whole sector
+ // in the true position)
+ // Was: specialMap.Add(47,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.61,-1.18)));
#endif
- AliMpReader reader2(kStation1, kNonBendingPlane);
+ AliMpSectorReader reader2(kStation1, kNonBendingPlane);
AliMpSector* sector2 = reader2.BuildSector();
-
- reflectZ = false;
- where = TVector3(where.X()+0.63/2.,where.Y()+0.42/2., 0.); //add a half pad shift
+
+ //reflectZ = false;
+ reflectZ = true;
+ TVector2 offset = sector2->Position();
+ where = TVector3(where.X()+offset.X(), where.Y()+offset.Y(), 0.);
+ // Add the half-pad shift of the non-bending plane wrt bending plane
+ // (The shift is defined in the mapping as sector offset)
+ // Fix (4) - was TVector3(where.X()+0.63/2, ... - now it is -0.63/2
PlaceSector(sector2, specialMap, where, reflectZ, chamber);
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
specialMap.Delete();
#endif
}
//______________________________________________________________________________
-void AliMUONSt1GeometryBuilderV2::CreateFoamBox(const char* name,const TVector2& dimensions)
+void AliMUONSt1GeometryBuilderV2::CreateFoamBox(
+ Int_t segNumber,
+ const TVector2& dimensions)
{
// create all the elements in the copper plane
// --
par[0] = dimensions.X();
par[1] = dimensions.Y();
par[2] = TotalHzPlane();
- gMC->Gsvolu(name,"BOX",idAir,par,3);
+ gMC->Gsvolu(PlaneSegmentName(segNumber).Data(),"BOX",idAir,par,3);
// foam layer
- GReal_t posX,posY,posZ;
- char eName[5];
- strcpy(eName,name);
- eName[3]=fgkFoamLayerSuffix;
par[0] = dimensions.X();
par[1] = dimensions.Y();
par[2] = fgkHzFoam;
- gMC->Gsvolu(eName,"BOX",idFoam,par,3);
+ gMC->Gsvolu(FoamBoxName(segNumber).Data(),"BOX",idFoam,par,3);
+ GReal_t posX,posY,posZ;
posX=0.;
posY=0.;
posZ = -TotalHzPlane() + fgkHzFoam;
- gMC->Gspos(eName,1,name,posX,posY,posZ,0,"ONLY");
+ gMC->Gspos(FoamBoxName(segNumber).Data(),1,
+ PlaneSegmentName(segNumber).Data(),posX,posY,posZ,0,"ONLY");
// mechanical plane FR4 layer
- eName[3]='R';
par[0] = dimensions.X();
par[1] = dimensions.Y();
par[2] = fgkHzFR4;
- gMC->Gsvolu(eName,"BOX",idFR4,par,3);
+ gMC->Gsvolu(FR4BoxName(segNumber).Data(),"BOX",idFR4,par,3);
posX=0.;
posY=0.;
posZ = -TotalHzPlane()+ 2.*fgkHzFoam + fgkHzFR4;
- gMC->Gspos(eName,1,name,posX,posY,posZ,0,"ONLY");
+ gMC->Gspos(FR4BoxName(segNumber).Data(),1,
+ PlaneSegmentName(segNumber).Data(),posX,posY,posZ,0,"ONLY");
}
//______________________________________________________________________________
-void AliMUONSt1GeometryBuilderV2::CreatePlaneSegment(const char* name,const TVector2& dimensions,
- Int_t nofHoles)
+void AliMUONSt1GeometryBuilderV2::CreatePlaneSegment(Int_t segNumber,
+ const TVector2& dimensions,
+ Int_t nofHoles)
{
// Create a segment of a plane (this includes a foam layer,
// holes in the foam to feed the kaptons through, kapton connectors
// and the mother board.)
// --
- CreateFoamBox(name,dimensions);
+ CreateFoamBox(segNumber,dimensions);
- char eName[5];
- strcpy(eName,name);
- eName[3]=fgkFoamLayerSuffix;
-
for (Int_t holeNum=0;holeNum<nofHoles;holeNum++) {
GReal_t posX = ((2.*holeNum+1.)/nofHoles-1.)*dimensions.X();
GReal_t posY = 0.;
GReal_t posZ = 0.;
- gMC->Gspos(fgkHoleName,holeNum+1,eName,posX,posY,posZ,0,"ONLY");
+ gMC->Gspos(fgkHoleName,holeNum+1,
+ FoamBoxName(segNumber).Data(),posX,posY,posZ,0,"ONLY");
}
}
const Float_t kAlp2OETF2 = 2.94;
// Trapezoid 3
- const Float_t kBl1OETF3 = 1.767/2.;
- const Float_t kTl1OETF3 = 3.01/2.;
+ //const Float_t kBl1OETF3 = 1.767/2.;
+ //const Float_t kTl1OETF3 = 3.01/2.;
+ const Float_t kBl1OETF3 = 1.117/2.;
+ const Float_t kTl1OETF3 = 2.36/2.;
const Float_t kAlp1OETF3 = 4.94;
+ // Fix (5) - overlap of SQ21 with 041M and 125M
- const Float_t kBl2OETF3 = 1.767/2.;
- const Float_t kTl2OETF3 = 3.01/2.;
+ //const Float_t kBl2OETF3 = 1.767/2.;
+ //const Float_t kTl2OETF3 = 3.01/2.;
+ const Float_t kBl2OETF3 = 1.117/2.;
+ const Float_t kTl2OETF3 = 2.36/2.;
const Float_t kAlp2OETF3 = 4.94;
+ // Fix (5) - overlap of SQ21 with 041M and 125M
// Trapezoid 4
const Float_t kBl1OETF4 = 0.;
par[4] = fgkMotherPhiU1;
gMC->Gsvolu(QuadrantMLayerName(chamber),"TUBS",idAir,par,5);
+// Replace the volume shape with a composite shape
+// with substracted overlap with beam shield (YMOT)
+
+ if ( gMC->IsRootGeometrySupported() &&
+ TString(gMC->ClassName()) != "TGeant4") {
+
+ // Get shape
+ TGeoVolume* mlayer
+ = gGeoManager->FindVolumeFast(QuadrantMLayerName(chamber));
+ if ( !mlayer ) {
+ AliErrorStream()
+ << "Quadrant volume " << QuadrantMLayerName(chamber) << " not found"
+ << endl;
+ }
+ else {
+ TGeoShape* quadrant = mlayer->GetShape();
+ quadrant->SetName("quadrant");
+
+ // Beam shield recess
+ par[0] = 0;
+ par[1] = 15.4;
+ par[2] = fgkMotherThick1;
+ new TGeoTube("shield_tube", par[0], par[1], par[2]);
+
+ // Displacement
+ posX = 2.6;
+ posY = 2.6;
+ posZ = 0;
+ TGeoTranslation* displacement
+ = new TGeoTranslation("TR", posX, posY, posZ);
+ displacement->RegisterYourself();
+
+ // Composite shape
+ TGeoShape* composite
+ = new TGeoCompositeShape("composite", "quadrant-shield_tube:TR");
+
+ // Reset shape to volume
+ mlayer->SetShape(composite);
+ }
+ }
+
// Quadrant volume TUBS2, positioned at the end
par[0] = fgkMotherIR2;
par[1] = fgkMotherOR2;
xCenter[0] = 73.201 + fgkDeltaQuadLHC;
xCenter[1] = 78.124 + fgkDeltaQuadLHC;
- xCenter[2] = 82.862 + fgkDeltaQuadLHC;
+ //xCenter[2] = 82.862 + fgkDeltaQuadLHC;
+ xCenter[2] = 83.102 + fgkDeltaQuadLHC;
xCenter[3] = 87.418 + fgkDeltaQuadLHC;
+ // Fix (5) - overlap of SQ21 with 041M and 125M
yCenter[0] = 68.122 + fgkDeltaQuadLHC;
yCenter[1] = 62.860 + fgkDeltaQuadLHC;
- yCenter[2] = 57.420 + fgkDeltaQuadLHC;
+ //yCenter[2] = 57.420 + fgkDeltaQuadLHC;
+ yCenter[2] = 57.660 + fgkDeltaQuadLHC;
yCenter[3] = 51.800 + fgkDeltaQuadLHC;
+ // Fix (5) - overlap of SQ21 with 041M and 125M
xCenter[4] = 68.122 + fgkDeltaQuadLHC;
xCenter[5] = 62.860 + fgkDeltaQuadLHC;
posZ = 0.;
gMC->Gspos("SQ36",2,QuadrantMLayerName(chamber),posX, posY, posZ, 0, "ONLY");
- posX = 98.31-kNearFarLHC;
+ posX = 98.05-kNearFarLHC;
posY = 12.77-kNearFarLHC;
-
posZ = 2.0*kHzLateralSightAl+kHzVerticalCradleAl-fgkMotherThick2;
+ // Fix (2) of extrusion SQ36 from SQN1, SQN2, SQF1, SQF2
+ // (was posX = 98.31 ...)
gMC->Gspos("SQ36",1,QuadrantNLayerName(chamber),posX, posY, posZ, 0, "ONLY");
posZ = -1.0*posZ;
gMC->Gspos("SQ36",3,QuadrantFLayerName(chamber),posX, posY, posZ, 0, "ONLY");
gMC->Gspos("SQ37",3,QuadrantMLayerName(chamber),posX, posY, posZ, 0, "ONLY");
// LateralSightSupport - 2 copies
- posX = 98.53-kNearFarLHC;
+ posX = 98.33-kNearFarLHC;
posY = 10.00-kNearFarLHC;
posZ = kHzLateralSightAl-fgkMotherThick2;
+ // Fix (3) of extrusion SQ38 from SQN1, SQN2, SQF1, SQF2
+ // (was posX = 98.53 ...)
gMC->Gspos("SQ38",1,QuadrantNLayerName(chamber),posX, posY, posZ, 0, "ONLY");
posZ = -1.0*posZ;
gMC->Gspos("SQ38",2,QuadrantFLayerName(chamber),posX, posY, posZ, 0, "ONLY");
GReal_t posX,posY,posZ;
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
vector<Int_t> alreadyDone;
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
TArrayI alreadyDone(20);
Int_t nofAlreadyDone = 0;
#endif
for (Int_t iseg=0;iseg<row->GetNofRowSegments();iseg++){ // for each row segment
AliMpVRowSegment* seg = row->GetRowSegment(iseg);
- char segName[5];
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
SpecialMap::iterator iter
= specialMap.find(seg->GetMotifPositionId(0));
if ( iter == specialMap.end()){ //if this is a normal segment (ie. not part of <specialMap>)
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
Long_t value = specialMap.GetValue(seg->GetMotifPositionId(0));
if ( value == 0 ){ //if this is a normal segment (ie. not part of <specialMap>)
#endif
// create the cathode part
- sprintf(segName,"%.3dM", segNum);
- CreatePlaneSegment(segName, seg->Dimensions()/10., seg->GetNofMotifs());
+ CreatePlaneSegment(segNum, seg->Dimensions(), seg->GetNofMotifs());
- posX = where.X() + seg->Position().X()/10.;
- posY = where.Y() + seg->Position().Y()/10.;
+ posX = where.X() + seg->Position().X();
+ posY = where.Y() + seg->Position().Y();
posZ = where.Z() + sgn * (TotalHzPlane() + fgkHzGas + 2.*fgkHzPadPlane);
- gMC->Gspos(segName, 1, QuadrantMLayerName(chamber), posX, posY, posZ, reflZ, "ONLY");
+ gMC->Gspos(PlaneSegmentName(segNum).Data(), 1,
+ QuadrantMLayerName(chamber), posX, posY, posZ, reflZ, "ONLY");
// and place all the daughter boards of this segment
for (Int_t motifNum=0;motifNum<seg->GetNofMotifs();motifNum++) {
if ( sector->GetDirection() == kX) copyNo += fgkDaughterCopyNoOffset;
// Position
- posX = where.X() + motifPos->Position().X()/10.+fgkOffsetX;
- posY = where.Y() + motifPos->Position().Y()/10.+fgkOffsetY;
+ posX = where.X() + motifPos->Position().X() + fgkOffsetX;
+ posY = where.Y() + motifPos->Position().Y() + fgkOffsetY;
posZ = where.Z() + sgn * (fgkMotherThick1 - TotalHzDaughter());
gMC->Gspos(fgkDaughterName, copyNo, QuadrantMLayerName(chamber), posX, posY, posZ, reflZ, "ONLY");
Int_t motifPosId = seg->GetMotifPositionId(motifNum);
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
if (find(alreadyDone.begin(),alreadyDone.end(),motifPosId)
!= alreadyDone.end()) continue; // don't treat the same motif twice
AliMUONSt1SpecialMotif spMot = specialMap[motifPosId];
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
Bool_t isDone = false;
Int_t i=0;
while (i<nofAlreadyDone && !isDone) {
// place the hole for the motif, wrt the requested rotation angle
Int_t rot = ( spMot.GetRotAngle()<0.1 ) ? reflZ:rotMat;
- posX = where.X() + motifPos->Position().X()/10.+spMot.GetDelta().X();
- posY = where.Y() + motifPos->Position().Y()/10.+spMot.GetDelta().Y();
+ posX = where.X() + motifPos->Position().X() + spMot.GetDelta().X();
+ posY = where.Y() + motifPos->Position().Y() + spMot.GetDelta().Y();
posZ = where.Z() + sgn * (TotalHzPlane() + fgkHzGas + 2.*fgkHzPadPlane);
gMC->Gspos(fgkHoleName, copyNo, QuadrantMLayerName(chamber), posX, posY, posZ, rot, "ONLY");
posZ = where.Z() + sgn * (fgkMotherThick1 - TotalHzDaughter());
gMC->Gspos(fgkDaughterName, copyNo, QuadrantMLayerName(chamber), posX, posY, posZ, rot, "ONLY");
-#ifdef ST1_WITH_STL
+#ifdef WITH_STL
alreadyDone.push_back(motifPosId);// mark this motif as done
#endif
-#ifdef ST1_WITH_ROOT
+#ifdef WITH_ROOT
if (nofAlreadyDone == alreadyDone.GetSize())
alreadyDone.Set(2*nofAlreadyDone);
alreadyDone.AddAt(motifPosId, nofAlreadyDone++);
{
// Create the detailed GEANT geometry for the dimuon arm station1
// --
- cout << "AliMUONSt1GeometryBuilderV2::CreateGeometry()" << endl;
- cout << "_________________________________________" << endl;
+ AliDebug(1,"Called");
+
+ // Define chamber volumes as virtual
+ //
// Create basic volumes
//
//
//
// II. | I. I. | II.
- // | (151) | (100)
+ // | (101) | (100)
// _____ | ____ _____ | ____
// | |
// III. | IV. IV. | III.
- // (150) | (101)
+ // (102) | (103)
//
/*
Int_t rotm[4];
scale[3] = TVector3( 1, -1, -1); // quadrant IV
Int_t detElemId[4];
- detElemId[0] = 51; // quadrant I
+ detElemId[0] = 1; // quadrant I
detElemId[1] = 0; // quadrant II
- detElemId[2] = 1; // quadrant III
- detElemId[3] = 50; // quadrant IV
+ detElemId[2] = 3; // quadrant III
+ detElemId[3] = 2; // quadrant IV
// Shift in Z of the middle layer
- Double_t deltaZ = 6.5/2.;
+ Double_t deltaZ = 7.5/2.;
// Position of quadrant I wrt to the chamber position
- TVector3 pos0(-fgkDeltaQuadLHC, -fgkDeltaQuadLHC, deltaZ);
+ // TVector3 pos0(-fgkDeltaQuadLHC, -fgkDeltaQuadLHC, deltaZ);
// Shift for near/far layers
GReal_t shiftXY = fgkFrameOffset;
// Place the quadrant
for (Int_t i=0; i<4; i++) {
+ // DE envelope
+ GReal_t posx0, posy0, posz0;
+ posx0 = fgkPadXOffsetBP * scale[i].X();
+ posy0 = fgkPadYOffsetBP * scale[i].Y();;
+ posz0 = deltaZ * scale[i].Z();
+ GetEnvelopes(ich-1)
+ ->AddEnvelope(QuadrantEnvelopeName(ich,i), detElemId[i] + ich*100, true,
+ TGeoTranslation(posx0, posy0, posz0), rotm[i]);
+
// Middle layer
GReal_t posx, posy, posz;
- posx = pos0.X() * scale[i].X();
- posy = pos0.Y() * scale[i].Y();
- //posz = pos0.Z() * scale[i].Z() + AliMUONConstants::DefaultChamberZ(ich-1);
- //gMC->Gspos(QuadrantMLayerName(ich), i+1, "ALIC", posx, posy, posz, rotm[i], "ONLY");
- posz = pos0.Z() * scale[i].Z();
+ posx = -fgkDeltaQuadLHC - fgkPadXOffsetBP;
+ posy = -fgkDeltaQuadLHC - fgkPadYOffsetBP;
+ posz = 0.;
GetEnvelopes(ich-1)
- ->AddEnvelope(QuadrantMLayerName(ich), detElemId[i] + ich*100, i+1,
- TGeoTranslation(posx, posy, posz), rotm[i]);
+ ->AddEnvelopeConstituent(QuadrantMLayerName(ich), QuadrantEnvelopeName(ich,i),
+ i+1, TGeoTranslation(posx, posy, posz));
// Near/far layers
- Real_t posx2 = posx + shiftXY * scale[i].X();
- Real_t posy2 = posy + shiftXY * scale[i].Y();
- Real_t posz2 = posz - scale[i].Z()*shiftZ;
+ GReal_t posx2 = posx + shiftXY;;
+ GReal_t posy2 = posy + shiftXY;;
+ GReal_t posz2 = posz - shiftZ;;
//gMC->Gspos(QuadrantNLayerName(ich), i+1, "ALIC", posx2, posy2, posz2, rotm[i],"ONLY");
GetEnvelopes(ich-1)
- ->AddEnvelope(QuadrantNLayerName(ich), 0, i+1, TGeoTranslation(posx2, posy2, posz2), rotm[i]);
+ ->AddEnvelopeConstituent(QuadrantNLayerName(ich), QuadrantEnvelopeName(ich,i),
+ i+1, TGeoTranslation(posx2, posy2, posz2));
- posz2 = posz + scale[i].Z()*shiftZ;
+ posz2 = posz + shiftZ;
//gMC->Gspos(QuadrantFLayerName(ich), i+1, "ALIC", posx2, posy2, posz2, rotm[i],"ONLY");
GetEnvelopes(ich-1)
- ->AddEnvelope(QuadrantFLayerName(ich), 0, i+1, TGeoTranslation(posx2, posy2, posz2), rotm[i]);
+ ->AddEnvelopeConstituent(QuadrantFLayerName(ich), QuadrantEnvelopeName(ich,i),
+ i+1, TGeoTranslation(posx2, posy2, posz2));
}
}
}
// Defines the transformations for the station2 chambers.
// ---
- AliMUONChamber* iChamber1 = &fMUON->Chamber(0);
- Double_t zpos1 = - iChamber1->Z();
- iChamber1->GetGeometry()
- ->SetTranslation(TGeoTranslation(0., 0., zpos1));
+ SetVolume(0, "SC01", true);
+ SetVolume(1, "SC02", true);
+
+ Double_t zpos1 = - AliMUONConstants::DefaultChamberZ(0);
+ SetTranslation(0, TGeoTranslation(0., 0., zpos1));
- AliMUONChamber* iChamber2 = &fMUON->Chamber(1);
- Double_t zpos2 = - iChamber2->Z();
- iChamber2->GetGeometry()
- ->SetTranslation(TGeoTranslation(0., 0., zpos2));
+ Double_t zpos2 = - AliMUONConstants::DefaultChamberZ(1);
+ SetTranslation(1, TGeoTranslation(0., 0., zpos2));
}
//______________________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff