From 0646a0e826b86a3a0c935c7b3eca22821b850bd0 Mon Sep 17 00:00:00 2001 From: nilsen Date: Fri, 23 Mar 2001 00:12:23 +0000 Subject: [PATCH] Set Reading of AliITSgeom data from Geant3 common blocks as the default and not a .det file. Removed redundent calls to BuildGeometry. --- ITS/AliITSv5.cxx | 20 ++++++++++++-------- ITS/AliITSv5asymm.cxx | 17 ++++++++--------- ITS/AliITSv5symm.cxx | 24 ++++++++++++++---------- ITS/AliITSvPPRasymm.cxx | 7 +++++-- ITS/AliITSvPPRsymm.cxx | 7 +++++-- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx index ec10b59f62c..85129e086bd 100644 --- a/ITS/AliITSv5.cxx +++ b/ITS/AliITSv5.cxx @@ -15,6 +15,14 @@ /* $Log$ +Revision 1.31 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(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.30 2001/02/09 20:06:26 nilsen Fixed bug in distructor. Can't distroy fixxed length arrays. Thanks Peter. @@ -120,8 +128,8 @@ AliITSv5::AliITSv5() { fIdSens = 0; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // 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 = 1; for(i=0;i<60;i++) fRead[i] = '\0'; @@ -147,8 +155,8 @@ AliITSv5::AliITSv5(const char *name, const char *title) : AliITS(name, title){ for (i=0;iInitAliITSgeom(); if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite); - if(bg) BuildGeometry(); // call BuildGeometry here if fITSgeom was not - // defined ealier AliITS::Init(); // for(i=0;i<72;i++) cout << "*"; diff --git a/ITS/AliITSv5asymm.cxx b/ITS/AliITSv5asymm.cxx index d7761e12b3e..9aa5245cfaf 100644 --- a/ITS/AliITSv5asymm.cxx +++ b/ITS/AliITSv5asymm.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.10 2001/02/14 14:22:58 nilsen +Now looking in the right director for the old .det. + Revision 1.9 2001/02/14 14:12:43 nilsen Forgot about the nonexisting v in ITSgeometry_5.det. @@ -137,8 +140,8 @@ AliITSv5asymm::AliITSv5asymm() { fIdSens = 0; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // 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 = 3; for(i=0;i<60;i++) fRead[i] = '\0'; @@ -164,8 +167,8 @@ AliITSv5asymm::AliITSv5asymm(const char *name, const char *title) : AliITS(name, for (i=0;iGetNladders(lay);lad++) for(det=1;det<=gm->GetNdetectors(lay);det++){ try { - box = new TBRIK ("ActiveSPD","Active volume of SPD","SPD SI DET", + box = new TBRIK("ActiveSPD","Active volume of SPD","SPD SI DET", 0.64,0.0075,4.19); } catch (...) { cout << "EXCEPTION in box = new TBRIK" << endl; @@ -751,13 +754,11 @@ void AliITSv5asymm::Init(){ // Initialise the ITS after it has been created. //////////////////////////////////////////////////////////////////////// Int_t i; - Bool_t bg = kFALSE; cout << endl; for(i=0;i<30;i++) cout << "*";cout << " ITSv5_Init "; for(i=0;i<30;i++) cout << "*";cout << endl; // - if(fITSgeom==0) bg = kTRUE; if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60); if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60); if(fITSgeom!=0) delete fITSgeom; @@ -767,8 +768,6 @@ void AliITSv5asymm::Init(){ if(!fGeomDetIn) this->InitAliITSgeom(); if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite); - if(bg) BuildGeometry(); // call BuildGeometry here if fITSgeom was not - // defined ealier. AliITS::Init(); // for(i=0;i<72;i++) cout << "*"; diff --git a/ITS/AliITSv5symm.cxx b/ITS/AliITSv5symm.cxx index dcc179d634b..7e99fef9374 100644 --- a/ITS/AliITSv5symm.cxx +++ b/ITS/AliITSv5symm.cxx @@ -15,6 +15,14 @@ /* $Log$ +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(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. @@ -123,8 +131,8 @@ AliITSv5symm::AliITSv5symm() { fIdSens = 0; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // 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'; @@ -150,8 +158,8 @@ AliITSv5symm::AliITSv5symm(const char *name, const char *title) : AliITS(name, t for (i=0;iInitAliITSgeom(); if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite); - if(bg) BuildGeometry(); // call BuildGeometry here if fITSgeom was not - // defined ealier. AliITS::Init(); // for(i=0;i<72;i++) cout << "*"; diff --git a/ITS/AliITSvPPRasymm.cxx b/ITS/AliITSvPPRasymm.cxx index 8ee5e230808..8d1f6004988 100644 --- a/ITS/AliITSvPPRasymm.cxx +++ b/ITS/AliITSvPPRasymm.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.25 2001/03/20 19:22:51 barbera +Flags for the rails and the cooling fluid added. Some changes in the volumes of the SSD cones after the meeting with the engineers in Torino. + Revision 1.23 2001/03/13 21:18:44 barbera Some misleading comments removed @@ -147,7 +150,7 @@ AliITSvPPRasymm::AliITSvPPRasymm() { fIdSens = 0; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // Read .det file + fGeomDetIn = kFALSE; // Don't Read .det file fMajorVersion = IsVersion(); fMinorVersion = -1; for(i=0;i<60;i++) fRead[i] = '\0'; @@ -175,7 +178,7 @@ AliITSvPPRasymm::AliITSvPPRasymm(const char *name, const char *title) : AliITS(n fMinorVersion = 2; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // Read .det file + fGeomDetIn = kFALSE; // Don't Read .det file SetThicknessDet1(); SetThicknessDet2(); SetThicknessChip1(); diff --git a/ITS/AliITSvPPRsymm.cxx b/ITS/AliITSvPPRsymm.cxx index adb222332f5..bc6e7d31efc 100644 --- a/ITS/AliITSvPPRsymm.cxx +++ b/ITS/AliITSvPPRsymm.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.10 2001/03/15 13:47:55 barbera +Some service mother volumes modified + Revision 1.9 2001/03/13 18:13:30 barbera Some mother volumes sligthly modified to eliminate an overlap with the absorber @@ -181,7 +184,7 @@ AliITSvPPRsymm::AliITSvPPRsymm() { fIdSens = 0; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // Read .det file + fGeomDetIn = kFALSE; // Don't Read .det file fMajorVersion = IsVersion(); fMinorVersion = -1; for(i=0;i<60;i++) fRead[i] = '\0'; @@ -209,7 +212,7 @@ AliITSvPPRsymm::AliITSvPPRsymm(const char *name, const char *title) : AliITS(nam fMinorVersion = 2; fEuclidOut = kFALSE; // Don't write Euclide file fGeomDetOut = kFALSE; // Don't write .det file - fGeomDetIn = kTRUE; // Read .det file + fGeomDetIn = kFALSE; // Don't Read .det file SetThicknessDet1(); SetThicknessDet2(); SetThicknessChip1(); -- 2.43.0