// //
///////////////////////////////////////////////////////////////////////////////
-#include "TDirectory.h"
-#include "TBRIK.h"
-#include "TGeometry.h"
-#include "TLorentzVector.h"
-#include "TNode.h"
-#include "TVirtualMC.h"
-#include "TGeoManager.h"
+#include <TDirectory.h>
+#include <TGeoGlobalMagField.h>
+#include <TGeoManager.h>
#include <TGeoMatrix.h>
#include <TGeoPhysicalNode.h>
#include <TGeoVolume.h>
+#include <TLorentzVector.h>
+#include <TVirtualMC.h>
#include "AliConst.h"
+#include "AliGeomManager.h"
#include "AliLog.h"
#include "AliMagF.h"
#include "AliMC.h"
const Float_t AliTOFv6T0::fgkInterCentrModBorder2 = 57.5 ; // cm
const Float_t AliTOFv6T0::fgkExterInterModBorder1 = 196.0 ; // cm
const Float_t AliTOFv6T0::fgkExterInterModBorder2 = 203.5 ; // cm
-const Float_t AliTOFv6T0::fgkLengthInCeModBorder = 4.7 ; // cm
-const Float_t AliTOFv6T0::fgkLengthExInModBorder = 7.0 ; // cm
+const Float_t AliTOFv6T0::fgkLengthInCeModBorder = 7.2 ; // cm // it was 4.7 cm (AdC)
+const Float_t AliTOFv6T0::fgkLengthExInModBorder = 5.0 ; // cm // it was 7.0 cm (AdC)
const Float_t AliTOFv6T0::fgkModuleCoverThickness = 2.0 ; // cm
const Float_t AliTOFv6T0::fgkFEAwidth1 = 19.0; // cm
const Float_t AliTOFv6T0::fgkFEAwidth2 = 39.5;//38.5; // cm
// Save the geometry
TDirectory* saveDir = gDirectory;
- gAlice->GetRunLoader()->CdGAFile();
+ AliRunLoader::Instance()->CdGAFile();
fTOFGeometry->Write("TOFgeometry");
saveDir->cd();
// eventual changes in the geometry.
//
+ AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
+ Int_t modUID, modnum=0;
+
TString volPath;
TString symName;
for (Int_t isect = 0; isect < nSectors; isect++) {
for (Int_t istr = 1; istr <= nStrips; istr++) {
- //if (fTOFSectors[isect]==-1) continue;
+ modUID = AliGeomManager::LayerToVolUID(idTOF, modnum++);
+ if (fTOFSectors[isect]==-1) continue;
if (fTOFHoles && (isect==13 || isect==14 || isect==15)) {
if (istr<39) {
AliDebug(2,Form("symName=%s\n",symName.Data()));
AliDebug(2,"--------------------------------------------");
- gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
+ if(!gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data(),modUID))
+ AliError(Form("Alignable entry %s not set",symName.Data()));
//T2L matrices for alignment
- TGeoPNEntry *e = gGeoManager->GetAlignableEntry(symName.Data());
+ TGeoPNEntry *e = gGeoManager->GetAlignableEntryByUID(modUID);
if (e) {
- const char *path = e->GetTitle();
- if (!gGeoManager->cd(path)) {
- AliFatal(Form("Volume path %s not valid!",path));
- }
- TGeoHMatrix *globMatrix = gGeoManager->GetCurrentMatrix();
+ TGeoHMatrix *globMatrix = e->GetGlobalOrig();
Double_t phi = 20.0 * (isect % 18) + 10.0;
TGeoHMatrix *t2l = new TGeoHMatrix();
t2l->RotateZ(phi);
else {
AliError(Form("Alignable entry %s is not valid!",symName.Data()));
}
-
imod++;
}
}
symName = snSM;
symName += Form("%02d",isect);
- AliDebug(2,"--------------------------------------------");
- AliDebug(2,Form("Alignable object %d", isect+imod));
- AliDebug(2,Form("volPath=%s\n",volPath.Data()));
- AliDebug(2,Form("symName=%s\n",symName.Data()));
- AliDebug(2,"--------------------------------------------");
-
- gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
-
- }
-
-}
-//____________________________________________________________________________
-void AliTOFv6T0::BuildGeometry()
-{
- //
- // Build TOF ROOT geometry for the ALICE event display
- //
- TNode *node, *top;
- const int kColorTOF = 27;
-
- TGeometry *globalGeometry = (TGeometry*)gAlice->GetGeometry();
-
- // Find top TNODE
- top = globalGeometry->GetNode("alice");
-
- // Position the different copies
- const Float_t krTof =(fTOFGeometry->Rmax()+fTOFGeometry->Rmin())/2.;
- const Float_t khTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin();
- const Int_t kNTof = fTOFGeometry->NSectors();
- const Float_t kangle = k2PI/kNTof;
-
- Float_t ang;
-
- // define offset for nodes
- Float_t zOffsetB = (fTOFGeometry->ZlenA()*0.5 + (fgkInterCentrModBorder1+fgkInterCentrModBorder2)*0.5)*0.5;
- Float_t zOffsetA = 0.;
+ AliDebug(2,"--------------------------------------------");
+ AliDebug(2,Form("Alignable object %d", isect+imod));
+ AliDebug(2,Form("volPath=%s\n",volPath.Data()));
+ AliDebug(2,Form("symName=%s\n",symName.Data()));
+ AliDebug(2,"--------------------------------------------");
- // Define TOF basic volume
- char nodeName0[16], nodeName1[16], nodeName2[16];
- char nodeName3[16], nodeName4[16], rotMatNum[16];
+ gGeoManager->SetAlignableEntry(symName.Data(),volPath.Data());
- if (fTOFHoles) {
- new TBRIK("S_TOF_B","TOF box","void",
- fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
- new TBRIK("S_TOF_C","TOF box","void",
- fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenB()*0.5);
}
- new TBRIK("S_TOF_A","TOF box","void",
- fTOFGeometry->StripLength()*0.5, khTof*0.5, fTOFGeometry->ZlenA()*0.5);
- for (Int_t nodeNum=1;nodeNum<kNTof+1;nodeNum++){
-
- if (nodeNum<10) {
- sprintf(rotMatNum,"rot50%i",nodeNum);
- sprintf(nodeName0,"FTO00%i",nodeNum);
- sprintf(nodeName1,"FTO10%i",nodeNum);
- sprintf(nodeName2,"FTO20%i",nodeNum);
- sprintf(nodeName3,"FTO30%i",nodeNum);
- sprintf(nodeName4,"FTO40%i",nodeNum);
- }
- if (nodeNum>9) {
- sprintf(rotMatNum,"rot5%i",nodeNum);
- sprintf(nodeName0,"FTO0%i",nodeNum);
- sprintf(nodeName1,"FTO1%i",nodeNum);
- sprintf(nodeName2,"FTO2%i",nodeNum);
- sprintf(nodeName3,"FTO3%i",nodeNum);
- sprintf(nodeName4,"FTO4%i",nodeNum);
- }
-
- new TRotMatrix(rotMatNum,rotMatNum,90,-20*nodeNum,90,90-20*nodeNum,0,0);
- ang = (4.5-nodeNum) * kangle;
-
- if (fTOFHoles) {
- top->cd();
- node = new TNode(nodeName2,nodeName2,"S_TOF_B", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetB,rotMatNum);
- node->SetLineColor(kColorTOF);
- fNodes->Add(node);
-
- top->cd();
- node = new TNode(nodeName3,nodeName3,"S_TOF_C", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang),-zOffsetB,rotMatNum);
- node->SetLineColor(kColorTOF);
- fNodes->Add(node);
- }
-
- top->cd();
- node = new TNode(nodeName4,nodeName4,"S_TOF_A", krTof*TMath::Cos(ang), krTof*TMath::Sin(ang), zOffsetA,rotMatNum);
- node->SetLineColor(kColorTOF);
- fNodes->Add(node);
- } // end loop on nodeNum
-
}
//_____________________________________________________________________________
//
// Fill BTOF_%i (for i=0,...17) volumes
// with volumes FTOA (MRPC strip container),
- // In case of TOF holes, two sectors (i.e. 13th, 14th and 15th)
+ // In case of TOF holes, three sectors (i.e. 13th, 14th and 15th)
// are filled with volumes: FTOB and FTOC (MRPC containers),
//
//
// Fill BTOF_%i (for i=0,...17) volumes
// with volumes FPEA (to separate strips from FEA cards)
- // In case of TOF holes, two sectors (i.e. 13th, 14th and 15th)
+ // In case of TOF holes, three sectors (i.e. 13th, 14th and 15th)
// are filled with FPEB volumes
// (to separate MRPC strips from FEA cards)
//
for(Int_t isec=0; isec<fTOFGeometry->NSectors(); isec++) {
if(fTOFSectors[isec]==-1)continue;
sprintf(name, "BTOF%d",isec);
- if (!fgkFEAwithMasks[isec])
- gMC->Gspos("FAIC", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+ if (fgkFEAwithMasks[isec])
+ gMC->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
else {
if (fTOFHoles && (isec==13 || isec==14 || isec==15))
gMC->Gspos("FAIB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
else
- gMC->Gspos("FAIA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
+ gMC->Gspos("FAIC", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
}
}
Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
- Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+ //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
// FEA card mother-volume definition
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
gMC->Gsvolu("FCA1", "BOX ", idtmed[500], carpar, 3); // Air
gMC->Gsvolu("FCA2", "BOX ", idtmed[500], carpar, 3); // Air
Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
- Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+ //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
// FEA card volume positioning
gMC->Gsvolu("FRO1", "BOX ", idtmed[504], feaRoof1, 3); // Al
Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
- Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+ //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
// definition and positioning of a small air groove in the FRO1 volume
- Float_t airHole[3] = {feaRoof2[0], feaRoof2[1]*0.5, feaRoof1[2]};
+ Float_t airHole[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1]*0.5, feaRoof1[2]};
gMC->Gsvolu("FREE", "BOX ", idtmed[500], airHole, 3); // Air
gMC->Gspos("FREE", 1, "FRO1", 0., feaRoof1[1]-airHole[1], 0., 0, "ONLY");
gGeoManager->GetVolume("FRO1")->VisibleDaughters(kFALSE);
Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
// fourth FEA cooling element definition
// first FEA cooling element positioning
Float_t xcoor = xtof*0.5 - 25.;
- Float_t ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - al1[1];
+ Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - al1[1];
Float_t zcoor =-carpar[2] + 2.*feaRoof1[2] - al1[2];
gMC->Gspos("FAL1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FAL1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
// second FEA cooling element positioning
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - feaRoof1[1];
+ ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - feaRoof1[1];
zcoor =-carpar[2] + feaRoof1[2];
- gMC->Gspos("FRO1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
- gMC->Gspos("FRO1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+ gMC->Gspos("FRO1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+ gMC->Gspos("FRO1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
gMC->Gspos("FRO1", 1, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FRO1", 4, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
- gMC->Gspos("FRO1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
- gMC->Gspos("FRO1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
+ gMC->Gspos("FRO1", 2, "FCA1",-xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
+ gMC->Gspos("FRO1", 3, "FCA1", xcoor, ycoor, zcoor, 0, "MANY"); // (AdC)
gMC->Gspos("FRO1", 2, "FCA2",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FRO1", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
// third FEA cooling element positioning
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+ ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
zcoor =-carpar[2] + bar[2];
gMC->Gspos("FBAR", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FBAR", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
// fourth FEA cooling element positioning
Float_t tubepar[3] = {0., 0.4, xtof*0.5 - fgkCBLw};
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar[1];
+ ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar[1];
zcoor =-carpar[2] + 2.*bar[2] + 2.*tubepar[1] + bar1[2];
gMC->Gspos("FBA1", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FBA1", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
// fifth FEA cooling element positioning
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - bar2[1];
+ ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - bar2[1];
zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
gMC->Gspos("FBA2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FBA2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FBA2", 3, "FCA2", xcoor, ycoor, zcoor, 0, "ONLY");
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - 2.*tubepar[1] - bar2[1];
+ ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - 2.*tubepar[1] - bar2[1];
zcoor =-carpar[2] + 2.*bar[2] + bar2[2];
gMC->Gspos("FBA2", 5, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FBA2", 8, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
// first Nino ASIC mask volume positioning
// third Nino ASIC mask volume positioning
xcoor = xtof*0.5 - 25.;
- ycoor = carpar[1] - feaRoof2[1];
- zcoor = carpar[2] - 2.*al3[2] - feaRoof2[2];
+ ycoor = carpar[1] - fgkRoof2parameters[1];
+ zcoor = carpar[2] - 2.*al3[2] - fgkRoof2parameters[2];
gMC->Gspos("FRO2", 1, "FCA1",-xcoor, ycoor, zcoor, 0, "ONLY");
gMC->Gspos("FRO2", 4, "FCA1", xcoor, ycoor, zcoor, 0, "ONLY");
xcoor = feaParam[0] + (fgkFEAwidth2*0.5 - fgkFEAwidth1);
Float_t bar[3] = {fgkBar[0], fgkBar[1], fgkBar[2]};
Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
- Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+ //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
- carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+ carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
// Positioning of tubes for the SM cooling system
- Float_t ycoor = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+ Float_t ycoor = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
Float_t zcoor =-carpar[2] + 2.*bar[2] + tubepar[1];
gMC->Gspos("FTUB", 1, "FCA1", 0., ycoor, zcoor, idrotm[0], "ONLY");
gMC->Gspos("FTUB", 1, "FCA2", 0., ycoor, zcoor, idrotm[0], "ONLY");
}
ycoor = ytub + (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
- zcoor = (198.8 + 56.82)*0.5 - (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
+ zcoor = (198.8 + 56.82)*0.5;
gMC->Gspos("FLO2", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
gMC->Gspos("FLO2", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
- zcoor = (366.9 + 198.8)*0.5 - (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
+ zcoor = (366.9 + 198.8)*0.5;
gMC->Gspos("FLO3", 2, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
gMC->Gspos("FLO3", 1, "FAIB",-24., ycoor, zcoor, 0, "MANY");
ycoor = ytub - (tubepar[1] + 2.*bar2[1] + lonpar1[1]);
- zcoor = (198.8 + 56.82)*0.5 - (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
- gMC->Gspos("FLO2", 4, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
- gMC->Gspos("FLO2", 3, "FAIB",-24., ycoor, zcoor, 0, "MANY");
- zcoor = (366.9 + 198.8)*0.5 - (zlenA*0.5 + fgkInterCentrModBorder2)*0.5;
- gMC->Gspos("FLO3", 4, "FAIB",-24., ycoor,-zcoor, 0, "MANY");
- gMC->Gspos("FLO3", 3, "FAIB",-24., ycoor, zcoor, 0, "MANY");
+ zcoor = (198.8 + 56.82)*0.5;
+ gMC->Gspos("FLO2", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+ gMC->Gspos("FLO2", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
+ zcoor = (366.9 + 198.8)*0.5;
+ gMC->Gspos("FLO3", 4, "FAIB", 24., ycoor,-zcoor, 0, "MANY");
+ gMC->Gspos("FLO3", 3, "FAIB", 24., ycoor, zcoor, 0, "MANY");
}
Float_t barS2[3] = {fgkBarS2[0], fgkBarS2[1], fgkBarS2[2]};
gMC->Gsvolu("FBS2", "BOX ", idtmed[504], barS2, 3); // Al
- Float_t ytubBis = carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*barS2[1] - tubepar[1];
+ Float_t ytubBis = carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*barS2[1] - tubepar[1];
ycoor = ytubBis;
zcoor =-carpar[2] + barS[2];
gMC->Gspos("FBAS", 1, "FCA1",-24., ycoor, zcoor, 0, "ONLY");
Float_t al1[3] = {fgkAl1parameters[0], fgkAl1parameters[1], fgkAl1parameters[2]};
Float_t al3[3] = {fgkAl3parameters[0], fgkAl3parameters[1], fgkAl3parameters[2]};
Float_t feaRoof1[3] = {fgkRoof1parameters[0], fgkRoof1parameters[1], fgkRoof1parameters[2]};
- Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
+ //Float_t feaRoof2[3] = {fgkRoof2parameters[0], fgkRoof2parameters[1], fgkRoof2parameters[2]};
Float_t feaParam[3] = {fgkFEAparameters[0], fgkFEAparameters[1], fgkFEAparameters[2]};
// FEA cables definition
AliMatrix(idrotm[0], 180., 90., 90., 90., 90., 0.);
Float_t carpar[3] = {xtof*0.5 - fgkCBLw - fgkSawThickness,
- feaParam[1] + feaRoof1[1] + feaRoof2[1]*0.5,
+ feaParam[1] + feaRoof1[1] + fgkRoof2parameters[1]*0.5,
feaRoof1[2] + fgkBetweenLandMask*0.5 + al3[2]};
Float_t bar2[3] = {fgkBar2[0], fgkBar2[1], fgkBar2[2]};
Float_t ytub =-(ytof*0.5 - fgkModuleCoverThickness)*0.5 + carpar[1] +
- carpar[1] - 2.*feaRoof2[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
+ carpar[1] - 2.*fgkRoof2parameters[1]*0.5 - 2.*feaRoof1[1] - 2.*bar2[1] - tubepar[1];
// FEA cables positioning
Float_t xcoor = (tubepar[2] + (fgkFEAwidth2 - fgkFEAwidth1/6.)*0.5)*0.5;
}
zcoor = (90. - 223.)*0.5;
- gMC->Gspos("FTOS", 1, "BBCE", ra, 0., zcoor, 0, "ONLY");
+ gMC->Gspos("FTOS", 1, "BBCE", ra, -3., zcoor, 0, "ONLY");
}
//AliTOF::CreateMaterials();
- AliMagF *magneticField = (AliMagF*)gAlice->Field();
+ AliMagF *magneticField = (AliMagF*)((AliMagF*)TGeoGlobalMagField::Instance()->GetField());
Int_t isxfld = magneticField->Integ();
Float_t sxmgmx = magneticField->Max();
wmatg10[2]= we[2]*0.4;
wmatg10[3]= we[3]*0.4;
wmatg10[4]= we[4]*0.4;
- AliDebug(1,Form("wg10 %d %d %d %d %d", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
+ AliDebug(1,Form("wg10 %f %f %f %f %f", wmatg10[0], wmatg10[1], wmatg10[2], wmatg10[3], wmatg10[4]));
//Float_t densg10 = 1.7; //old value
Float_t densg10 = 2.0; // (+17.8%)
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff