#include <TVirtualMC.h>
#include "AliMpFiles.h"
-#include "AliMpReader.h"
+#include "AliMpSectorReader.h"
#include "AliMpSector.h"
#include "AliMpRow.h"
#include "AliMpVRowSegment.h"
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;
}
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;
// 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;
reflectZ = true;
- TVector2 offset = sector2->Offset();
- where = TVector3(where.X()+offset.X()/10., where.Y()+offset.Y()/10., 0.);
+ 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
// create the cathode part
sprintf(segName,"%.3dM", segNum);
- CreatePlaneSegment(segName, seg->Dimensions()/10., seg->GetNofMotifs());
+ CreatePlaneSegment(segName, 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");
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");
// 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");
// Shift in Z of the middle layer
Double_t deltaZ = 7.5/2.;
- // Double_t deltaZ = fgkMotherThick1;
- // Fix (6) - shift of the middle layer = half of its thickness
// Position of quadrant I wrt to the chamber position
// TVector3 pos0(-fgkDeltaQuadLHC, -fgkDeltaQuadLHC, deltaZ);