hole region in front of PHOS detector: update of sectors' numbers

diff --git a/TOF/AliTOFGeometry.cxx b/TOF/AliTOFGeometry.cxx
index 68f8ff400222769be28e8d414f02d16c9afbbfc4..97aaa83880304ed0792ff448360bf7a37028b304 100644 (file)
--- a/TOF/AliTOFGeometry.cxx
+++ b/TOF/AliTOFGeometry.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.19  2007/10/04 14:05:09  zampolli
+AliTOFGeometryV5 becoming AliTOFGeometry
+
 Revision 1.18  2007/02/19 18:55:26  decaro
 Added getter methods for volume path (for Event Display)
 
@@ -450,7 +453,7 @@ void AliTOFGeometry::GetVolumePath(Int_t *ind, Char_t *path ) {
   if( iplate==4) icopy=istrip+NStripC()+2*NStripB()+NStripA(); 
   icopy++;
   sprintf(string2,"FTOA_0/FLTA_0/FSTR_%i",icopy);
-  if(fHoles && (sector==11 || sector==12)){
+  if(fHoles && (sector==13 || sector==14 || sector==15)){
     if(iplate<2)  sprintf(string2,"FTOB_0/FLTB_0/FSTR_%i",icopy);
     if(iplate>2)  sprintf(string2,"FTOC_0/FLTC_0/FSTR_%i",icopy);
   }
@@ -496,7 +499,7 @@ void AliTOFGeometry::GetVolumePath(Int_t sector, Int_t plate, Int_t strip, Char_
   if(plate==4) icopy=strip+NStripC()+2*NStripB()+NStripA(); 
   icopy++;
   sprintf(string2,"FTOA_0/FLTA_0/FSTR_%i",icopy);
-  if(fHoles && (sector==11 || sector==12)) {
+  if(fHoles && (sector==13 || sector==14 || sector==15)){
     if(plate<2)  sprintf(string2,"FTOB_0/FLTB_0/FSTR_%i",icopy);
     if(plate>2)  sprintf(string2,"FTOC_0/FLTC_0/FSTR_%i",icopy);
   }

diff --git a/TOF/AliTOFv5T0.cxx b/TOF/AliTOFv5T0.cxx
index cfaa2067f6ff754ec28d2616b54a9d15bb86f43d..45d5a7b4d73e7236185b715261978aa46d046ca1 100644 (file)
--- a/TOF/AliTOFv5T0.cxx
+++ b/TOF/AliTOFv5T0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.22  2007/10/07 19:40:46  decaro
+right handling of l2t matrices and alignable entries in case of TOF staging geometry
+
 Revision 1.21  2007/10/04 13:15:30  arcelli
 updates to comply with AliTOFGeometryV5 becoming AliTOFGeometry
 
@@ -237,9 +240,9 @@ void AliTOFv5T0::AddAlignableVolumes() const
   for (Int_t isect = 0; isect < nSectors; isect++) {
     for (Int_t istr = 1; istr <= nStrips; istr++) {
 
-      if (fTOFSectors[isect]==-1) continue;
+      //if (fTOFSectors[isect]==-1) continue;
 
-      if (fTOFHoles && (isect==11 || isect==12)) {
+      if (fTOFHoles && (isect==13 || isect==14 || isect==15)) {
        if (istr<39) {
          vpL3 = "/FTOB_0";
          vpL4 = "/FLTB_0/FSTR_";
@@ -493,7 +496,7 @@ void AliTOFv5T0::TOFpc(Float_t xtof,  Float_t ytof, Float_t zlenA,
     if(fTOFSectors[isec]==-1)continue;
     char name[16];
     sprintf(name, "BTOF%d",isec);
-    if (fTOFHoles && (isec==11||isec==12)) {
+    if (fTOFHoles && (isec==13 || isec==14 || isec==15)) {
     //    if (fTOFHoles && (isec==16||isec==17)) { \\Old 6h convention
       xcoor = 0.;
       ycoor = (zlenA*0.5 + kInterCentrModBorder1)*0.5;

diff --git a/TOF/AliTOFv6T0.cxx b/TOF/AliTOFv6T0.cxx
index bc0b88bb67fd9b0ed2c02e6270f860126100dc73..fb51837523ff0e98b29e27859a9e75cda1c5ab8f 100644 (file)
--- a/TOF/AliTOFv6T0.cxx
+++ b/TOF/AliTOFv6T0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.10  2007/10/07 19:40:46  decaro
+right handling of l2t matrices and alignable entries in case of TOF staging geometry
+
 Revision 1.9  2007/10/07 19:36:29  decaro
 TOF materials and volumes description: update
 
@@ -226,9 +229,9 @@ void AliTOFv6T0::AddAlignableVolumes() const
   for (Int_t isect = 0; isect < nSectors; isect++) {
     for (Int_t istr = 1; istr <= nStrips; istr++) {
 
-      if (fTOFSectors[isect]==-1) continue;
+      //if (fTOFSectors[isect]==-1) continue;
 
-      if (fTOFHoles && (isect==11 || isect==12)) {
+      if (fTOFHoles && (isect==13 || isect==14 || isect==15)) {
        if (istr<39) {
          vpL3 = "/FTOB_0";
          vpL4 = "/FLTB_0/FSTR_";
@@ -969,7 +972,7 @@ void AliTOFv6T0::MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const
     if(fTOFSectors[isec]==-1)continue;
     char name[16];
     sprintf(name, "BTOF%d",isec);
-    if (fTOFHoles && (isec==11||isec==12)) {
+    if (fTOFHoles && (isec==13 || isec==14 || isec==15)) {
     //if (fTOFHoles && (isec==16||isec==17)) { \\Old 6h convention
       //xcoor = 0.;
       ycoor = (zlenA*0.5 + fgkInterCentrModBorder1)*0.5;
@@ -1019,7 +1022,7 @@ void AliTOFv6T0::MakeCoversInBTOFvolumes() const
     if(fTOFSectors[isec]==-1)continue;
     sprintf(name, "BTOF%d",isec);
     //if (fTOFHoles && (isec==16||isec==17)) \\Old 6h convention
-    if (fTOFHoles && (isec==11||isec==12))
+    if (fTOFHoles && (isec==13 || isec==14 || isec==15))
       gMC->Gspos("FPEB", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
     else
       gMC->Gspos("FPEA", 0, name, xcoor, ycoor, zcoor, idrotm[0], "ONLY");
@@ -1058,7 +1061,7 @@ void AliTOFv6T0::MakeBackInBTOFvolumes(Float_t ytof) const
     if(fTOFSectors[isec]==-1)continue;
     sprintf(name, "BTOF%d",isec);
     //if (fTOFHoles && (isec==16||isec==17)) \\Old 6h convention
-    if (fTOFHoles && (isec==11||isec==12))
+    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");