const Bool_t AliITSInitGeometry::fgkOldSDDbarrel = kFALSE;
const Bool_t AliITSInitGeometry::fgkOldSSDbarrel = kFALSE;
const Bool_t AliITSInitGeometry::fgkOldSDDcone = kFALSE;
-const Bool_t AliITSInitGeometry::fgkOldSSDcone = kTRUE;
+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::fgkOldServices = kFALSE;
const Bool_t AliITSInitGeometry::fgkOldSupports = kTRUE;
//______________________________________________________________________
AliITSInitGeometry::AliITSInitGeometry():
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";
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";
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/ITSssdSensor5_%d/ITSssdSensitivL5_1";
pathSSDsens2 = "%sITSssdLayer6_1/ITSssdLay6Ladd_%d/ITSssdSensor6_%d/ITSssdSensitivL6_1";
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.
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;