X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ITS%2FAliITSv5symm.cxx;h=a47dd9ab23a51b246e2e65a8b0ca26283b6ebb3d;hp=230dfc11c6c120768c0bcae539128198bac52e02;hb=3e225ff68c505567f6ef520490f12abb02276b72;hpb=58e13d9980a07704429833647a9668880ec8ed33

diff --git a/ITS/AliITSv5symm.cxx b/ITS/AliITSv5symm.cxx
index 230dfc11c6c..a47dd9ab23a 100644
--- a/ITS/AliITSv5symm.cxx
+++ b/ITS/AliITSv5symm.cxx
@@ -15,6 +15,24 @@
 
 /*
 $Log$
+Revision 1.9  2001/04/18 12:07:37  barbera
+Number of modules in layer 5 and 6 re-set to 23 and 26
+
+Revision 1.8  2001/03/23 00:12:23  nilsen
+Set Reading of AliITSgeom data from Geant3 common blocks as the default and
+not a .det file. Removed redundent calls to BuildGeometry.
+
+Revision 1.7  2001/02/13 16:53:35  nilsen
+Fixed a but when trying to use GEANT4. Needed to replace
+if(!((TGeant3*)gMC)) with if(!(dynamic_casst<TGeant3*>(gMC)))
+because just casting gMC to be TGeant3* even when it realy is a TGeant3 pointer
+did not result in a zero value. For AliITSv5asymm and AliITSv5symm, needed
+to fix a bug in the initilizers and a bug in BuildGeometry. This is now done
+in the same way as in AliITSv5.cxx.
+
+Revision 1.6  2001/02/09 20:06:26  nilsen
+Fixed bug in distructor. Can't distroy fixxed length arrays. Thanks Peter.
+
 Revision 1.5  2001/02/09 00:05:31  nilsen
 Added fMajor/MinorVersion variables and made other changes to better make
 use of the new code changes in AliITSgeom related classes.
@@ -120,8 +138,8 @@ AliITSv5symm::AliITSv5symm() {
     fIdSens = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Read .det file
-    fGeomOldDetIn = kTRUE;  // Read old formatted .det file
+    fGeomDetIn    = kFALSE; // Don't Read .det file
+    fGeomOldDetIn = kFALSE; // Don't Read old formatted .det file
     fMajorVersion = IsVersion();
     fMinorVersion = 2;
     for(i=0;i<60;i++) fRead[i] = '\0';
@@ -147,8 +165,8 @@ AliITSv5symm::AliITSv5symm(const char *name, const char *title) : AliITS(name, t
     for (i=0;i<fIdN;i++) fIdSens[i] = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Read .det file
-    fGeomOldDetIn = kTRUE;  // Read old formatted .det file
+    fGeomDetIn    = kFALSE; // Don't Read .det file
+    fGeomOldDetIn = kFALSE; // Don't Read old formatted .det file
     fMajorVersion = IsVersion();
     fMinorVersion = 2;
     for(i=0;i<60;i++) fRead[i] = '\0';
@@ -202,8 +220,9 @@ void AliITSv5symm::BuildGeometry(){
   //const int kColorITSSDD=kGreen;
   const int kColorITSSSD=kBlue;
   //
-  top=gAlice->GetGeometry()->GetNode("alice");
   AliITSgeom  *gm = this->GetITSgeom();
+  if(gm==0) return;
+  top=gAlice->GetGeometry()->GetNode("alice");
 
   Int_t       lay,lad,det,i;
   Text_t      name[10];
@@ -620,7 +639,7 @@ void AliITSv5symm::InitAliITSgeom(){
 //     Based on the geometry tree defined in Geant 3.21, this
 // routine initilizes the Class AliITSgeom from the Geant 3.21 ITS geometry
 // sturture.
-    if(!((TGeant3*)gMC)) {
+    if(!(dynamic_cast<TGeant3*>(gMC))) {
 	Error("InitAliITSgeom",
 		"Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
 	return;
@@ -666,7 +685,7 @@ void AliITSv5symm::InitAliITSgeom(){
 
     if(fITSgeom!=0) delete fITSgeom;
     nlad[0]=20;nlad[1]=40;nlad[2]=14;nlad[3]=22;nlad[4]=34;nlad[5]=38;
-    ndet[0]=4;ndet[1]=4;ndet[2]=6;ndet[3]=8;ndet[4]=22;ndet[5]=25;
+    ndet[0]=4;ndet[1]=4;ndet[2]=6;ndet[3]=8;ndet[4]=23;ndet[5]=26;
     fITSgeom = new AliITSgeom(0,6,nlad,ndet,mod);
     mod = -1;
     for(lay=1;lay<=nlayers;lay++){
@@ -690,9 +709,16 @@ void AliITSv5symm::InitAliITSgeom(){
 			    if(fMinorVersion==1){
                              fITSgeom->ReSetShape(kSPD,
 						  new AliITSgeomSPD300());
-			    } else if(fMinorVersion==2)
+			    } else if(fMinorVersion==2){
+                             fITSgeom->ReSetShape(kSPD,
+						  new AliITSgeomSPD300());
+			    }else if(fMinorVersion==3){
+                             fITSgeom->ReSetShape(kSPD,
+						  new AliITSgeomSPD425Long());
+			    }else{
                              fITSgeom->ReSetShape(kSPD,
 						  new AliITSgeomSPD300());
+			    } // end if
 		    } // end for det
 		} // end for k
             } // end for j
@@ -733,8 +759,8 @@ void AliITSv5symm::Init(){
     Int_t i;
 
     cout << endl;
-    for(i=0;i<30;i++) cout << "*";cout << " ITSv5_Init ";
-    for(i=0;i<30;i++) cout << "*";cout << endl;
+    for(i=0;i<28;i++) cout << "*";cout << " ITSv5symm_Init ";
+    for(i=0;i<28;i++) cout << "*";cout << endl;
 //
     if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60);
     if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60);