/*
$Log$
+Revision 1.17 2001/05/30 15:55:35 hristov
+Strings compared instead of pointers
+
+Revision 1.16 2001/05/30 14:04:31 hristov
+Dynamic cast replaced (F.Carminati)
+
+Revision 1.15 2001/05/25 06:47:16 hristov
+Bug fix in the creation of the AliITSgeom::fShape entry for SPD. Now there is both a proper shape entry and a default, should there be future changes. This bug was related to fMinorVersion=3 was not antisipated. (B.Nilsen)
+
+Revision 1.14 2001/05/16 14:57:16 alibrary
+New files for folders and Stack
+
+Revision 1.13 2001/05/09 01:00:19 nilsen
+Fixed up a typo in the cout of Init(). Now properly indecates which version
+of code is being used.
+
+Revision 1.12 2001/04/18 12:06:02 barbera
+Number of modules in layer 5 and 6 re-set to 23 and 26
+
+Revision 1.11 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.10 2001/02/14 14:22:58 nilsen
Now looking in the right director for the old .det.
#include "AliMC.h"
#include "AliRun.h"
-#include "../TGeant3/TGeant3.h"
+#include "AliGeant3.h"
#include "AliITShit.h"
#include "AliITSGeant3Geometry.h"
#include "AliITS.h"
delete [] filtmp;
if(file) {
fclose(file);
- cout << "Ready to read Euclid geometry file" << endl;
+ if(fDebug) cout << ClassName() << ": Ready to read Euclid geometry file" << endl;
ReadEuclid(fEuclidGeometry.Data(),topvol);
- cout << "Read in euclid geometries" << endl;
- } else {
- Error("CreateGeometry"," THE GEOM FILE %s DOES NOT EXIST !",
+ if(fDebug) cout << ClassName() << ": Read in euclid geometries" << endl;
+ } else
+ Fatal("CreateGeometry"," THE GEOM FILE %s DOES NOT EXIST !",
fEuclidGeometry.Data());
- exit(1);
- } // end if(file)
+ // end if(file)
//
// Place the ITS ghost volume ITSV in its mother volume (ALIC) and make it
// invisible
gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
} // end if (fEuclidOut)
- cout << "finished with euclid geometrys" << endl;
+ if(fDebug) cout << ClassName() << ": finished with euclid geometrys" << endl;
}
//______________________________________________________________________
// 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(!(dynamic_cast<TGeant3*>(gMC))) {
+ if(gMC->IsA()!=AliGeant3::Class()) {
Error("InitAliITSgeom",
"Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
return;
} // end if
- cout << "Reading Geometry transformation directly from Geant 3." << endl;
+ if(fDebug) cout << ClassName()
+ << ": Reading Geometry transformation directly from Geant 3." << endl;
const Int_t nlayers = 6;
const Int_t ndeep = 7;
Int_t itsGeomTreeNames[nlayers][ndeep],lnam[20],lnum[20];
// Sorry, but this is not very pritty code. It should be replaced
// at some point with a version that can search through the geometry
// tree its self.
- cout << "Reading Geometry informaton from Geant3 common blocks" << endl;
+ if(fDebug) cout << ClassName()
+ << ": Reading Geometry informaton from Geant3 common blocks" << endl;
for(i=0;i<20;i++) lnam[i] = lnum[i] = 0;
for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++)
itsGeomTreeNames[i][j] = ig->StringToInt(names[i][j]);
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++){
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
////////////////////////////////////////////////////////////////////////
Int_t i;
- cout << endl;
- for(i=0;i<30;i++) cout << "*";cout << " ITSv5_Init ";
- for(i=0;i<30;i++) cout << "*";cout << endl;
+ if(fDebug) {
+ cout << endl << ClassName() << ": ";
+ for(i=0;i<28;i++) cout << "*";cout << " ITSv5_Init ";
+ for(i=0;i<27;i++) cout << "*";cout << endl;
+ }
//
if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60);
if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60);
if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite);
AliITS::Init();
//
- for(i=0;i<72;i++) cout << "*";
- cout << endl;
+ if(fDebug) {
+ cout << ClassName() << ": ";
+ for(i=0;i<72;i++) cout << "*";
+ cout << endl;
+ }
}
//_____________________________________________________________________________
void AliITSv5asymm::StepManager(){
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff