X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSInitGeometry.cxx;h=64d8938e25933c6a0797020252929d70682d1fee;hb=973e8d952cfac7b94c5f0afde9fdc47294a6cf89;hp=abef3f53eafd846e7cb22e984b7bb22f0040f81b;hpb=e0d5d6f710478aca4cf29984a206ea75ba153eb6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSInitGeometry.cxx b/ITS/AliITSInitGeometry.cxx
index abef3f53eaf..64d8938e259 100644
--- a/ITS/AliITSInitGeometry.cxx
+++ b/ITS/AliITSInitGeometry.cxx
@@ -59,13 +59,13 @@ ClassImp(AliITSInitGeometry)
 const Bool_t AliITSInitGeometry::fgkOldSPDbarrel = kFALSE;
 const Bool_t AliITSInitGeometry::fgkOldSDDbarrel = kFALSE;
 const Bool_t AliITSInitGeometry::fgkOldSSDbarrel = kFALSE;
-const Bool_t AliITSInitGeometry::fgkOldSDDcone   = kTRUE;
-const Bool_t AliITSInitGeometry::fgkOldSSDcone   = kTRUE;
+const Bool_t AliITSInitGeometry::fgkOldSDDcone   = kFALSE;
+const Bool_t AliITSInitGeometry::fgkOldSSDcone   = kFALSE;
 const Bool_t AliITSInitGeometry::fgkOldSPDshield = kFALSE;
 const Bool_t AliITSInitGeometry::fgkOldSDDshield = kTRUE;
 const Bool_t AliITSInitGeometry::fgkOldSSDshield = kTRUE;
-const Bool_t AliITSInitGeometry::fgkOldServices  = kTRUE;
-const Bool_t AliITSInitGeometry::fgkOldSupports  = kTRUE;
+const Bool_t AliITSInitGeometry::fgkOldServices  = kFALSE;
+const Bool_t AliITSInitGeometry::fgkOldSupports  = kFALSE;
 //______________________________________________________________________
 AliITSInitGeometry::AliITSInitGeometry():
 TObject(),                   // Base Class
@@ -799,7 +799,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
   const AliITSDetector kIdet[6]   = {kSPD,kSPD,kSDD,kSDD,kSSD,kSSD};
   const TString kPathbase = "/ALIC_1/ITSV_1/";
 
-  char *pathSPDsens1, *pathSPDsens2;
+  const char *pathSPDsens1, *pathSPDsens2;
   if (SPDIsTGeoNative()) {
     pathSPDsens1="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay1-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay1-Ladder_%d/ITSSPDlay1-sensor_1";
     pathSPDsens2="%sITSSPD_1/ITSSPDCarbonFiberSectorV_%d/ITSSPDSensitiveVirtualvolumeM0_1/ITSSPDlay2-Stave_%d/ITSSPDhalf-Stave%d_1/ITSSPDlay2-Ladder_%d/ITSSPDlay2-sensor_1";
@@ -808,7 +808,7 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
     pathSPDsens2 = "%sITSD_1/IT12_1/I12B_%d/I20B_%d/L2H-STAVE%d_1/I1D7_%d/I1D1_1/ITS2_1";
   }
 
-  char *pathSDDsens1, *pathSDDsens2;
+  const char *pathSDDsens1, *pathSDDsens2;
   if (SDDIsTGeoNative()) {
     pathSDDsens1 = "%sITSsddLayer3_1/ITSsddLadd_%d/ITSsddSensor3_%d/ITSsddWafer3_%d/ITSsddSensitivL3_1";
     pathSDDsens2 = "%sITSsddLayer4_1/ITSsddLadd_%d/ITSsddSensor4_%d/ITSsddWafer4_%d/ITSsddSensitivL4_1";
@@ -817,10 +817,10 @@ Bool_t AliITSInitGeometry::InitAliITSgeomV11Hybrid(AliITSgeom *geom){
     pathSDDsens2 = "%sITSD_1/IT34_1/I005_%d/I402_%d/ITS4_%d";
   }
 
-  char *pathSSDsens1, *pathSSDsens2;
+  const char *pathSSDsens1, *pathSSDsens2;
   if (SSDIsTGeoNative()) {
-    pathSSDsens1 = "%sITSssdLayer5_1/ITSssdLay5Ladd_%d/ITSsddSensor5_%d/ITSsddSensitivL5_1";
-    pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSsddSensor6_%d/ITSsddSensitivL6_1";
+    pathSSDsens1 = "%sITSssdLayer5_1/ITSssdLay5Ladd_%d/ITSssdSensor5_%d/ITSssdSensitivL5_1";
+    pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSssdSensor6_%d/ITSssdSensitivL6_1";
   } else{
     pathSSDsens1 = "%sITSD_1/IT56_1/I565_%d/I562_%d/ITS5_%d";
     pathSSDsens2 = "%sITSD_1/IT56_1/I569_%d/I566_%d/ITS6_%d";
@@ -1096,8 +1096,6 @@ Bool_t AliITSInitGeometry::InitSegmentationPPRasymmFMD(AliITSDetector idet,
 	segSSD->SetPadSize(95.,0.); // strip x pitch in microns
 	segSSD->SetNPads(768,2); // number of strips on each side, sides.
 	segSSD->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
-	segSSD->SetAnglesLay5(0.0075,0.0275);//strip angels rad P and N
-	segSSD->SetAnglesLay6(0.0275,0.0075);//strip angels rad P and N
 	geom->ReSetShape(idet,segSSD);
     }break;
     default:{// Others, Note no kSDDp or kSSDp in this geometry.
@@ -1137,7 +1135,7 @@ Bool_t AliITSInitGeometry::GetTransformation(const TString &volumePath,
     gGeoManager->PushPath();
     if (!gGeoManager->cd(volumePath.Data())) {
       gGeoManager->PopPath();
-      Error("GetTransformation","Error in cd-ing to ",volumePath.Data());
+      Error("GetTransformation","Error in cd-ing to %s",volumePath.Data());
       return kFALSE;
     } // end if !gGeoManager
     mat = *gGeoManager->GetCurrentMatrix();
@@ -2080,7 +2078,7 @@ void AliITSInitGeometry::RecodeDetectorvPPRasymmFMD(Int_t mod,Int_t &cpn0,
             cpn1 = 26-det;
         } break;
         default:{
-            Error("RecodeDetector","New: mod=%d lay=%d not 1-6.");
+	  AliError(Form("New: mod=%d lay=%d not 1-6.",mod,lay));
             return;
         } break;
         } // end switch
@@ -2106,7 +2104,7 @@ void AliITSInitGeometry::RecodeDetectorvPPRasymmFMD(Int_t mod,Int_t &cpn0,
         cpn0 = lad;
     } break;
     default:{
-        Error("RecodeDetector","Old: mod=%d lay=%d not 1-6.");
+      AliError(Form("Old: mod=%d lay=%d not 1-6.",mod,lay));
         return;
     } break;
     } // end switch
@@ -2474,9 +2472,11 @@ Bool_t AliITSInitGeometry::WriteVersionString(Char_t *str,Int_t length,
     i = (Int_t)maj;
     sprintf(str,"Major Version= %d Minor Version= %d Revision: %s Date: %s",
             i,min,cvsrevision,cvsdate);
+    /* this gives compilation warnings on some compilers: descriptor zu
     if(GetDebug()>1)printf("AliITSInitGeometry::WriteVersionString: "
                        "n=%d str=%s revision[%zu] date[%zu]\n",
                        n,str,strlen(cvsrevision),strlen(cvsdate));
+    */
     delete[] cvsrevision;
     delete[] cvsdate;
     return kTRUE;