Now using root generated streamers.

diff --git a/ITS/AliITSv1.cxx b/ITS/AliITSv1.cxx
index f57c8e4c8a18e83cf0ae32e9dc2e32f5b1805549..cc012c2c81790273cf474e0a8346676c1ba7c025 100644 (file)
--- a/ITS/AliITSv1.cxx
+++ b/ITS/AliITSv1.cxx
@@ -15,8 +15,11 @@
 
 /*
 $Log$
-Revision 1.20  2000/10/02 21:28:08  fca
-Removal of useless dependecies via forward declarations
+Revision 1.14.2.9  2000/10/05 07:49:27  nilsen
+Removed hit generation from step manager.
+
+Revision 1.14.2.8  2000/07/31 13:50:37  barbera
+Updated from the release
 
 Revision 1.19  2000/07/10 16:07:19  fca
 Release version of ITS code
@@ -77,16 +80,17 @@ Introduction of the Copyright and cvs Log
 #include <TFile.h>    // only required for Tracking function?
 #include <TCanvas.h>
 #include <TObjArray.h>
+#include <TObjString.h>
 #include <TClonesArray.h>
 
 
 #include "AliMC.h"
-#include "AliMagF.h"
 #include "AliConst.h"
+#include "AliRun.h"
+#include "AliMagF.h"
 
 #include "AliITShit.h"
 #include "AliITSv1.h"
-#include "AliRun.h"
 
 
 ClassImp(AliITSv1)
@@ -97,16 +101,11 @@ AliITSv1::AliITSv1() {
 //    Standard default constructor for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
 
-  fIdN = 6;
-  fIdName = new TString[fIdN];
-  fIdName[0] = "ITS1";
-  fIdName[1] = "ITS2";
-  fIdName[2] = "ITS3";
-  fIdName[3] = "ITS4";
-  fIdName[4] = "ITS5";
-  fIdName[5] = "ITS6";
-  fIdSens    = new Int_t[fIdN];
-  for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+  fIdN    = 0;
+  fIdName = 0;
+  fIdSens = 0;
+  fMajorVersion = 1;
+  fMinorVersion = -1;
 }
 //_____________________________________________________________________________
 AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
@@ -114,16 +113,29 @@ AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
 //    Standard constructor for the ITS version 1.
 ////////////////////////////////////////////////////////////////////////
 
-  fIdN = 6;
-  fIdName = new TString[fIdN];
-  fIdName[0] = "ITS1";
-  fIdName[1] = "ITS2";
-  fIdName[2] = "ITS3";
-  fIdName[3] = "ITS4";
-  fIdName[4] = "ITS5";
-  fIdName[5] = "ITS6";
-  fIdSens    = new Int_t[fIdN];
-  for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+    fIdN    = 6;
+/*
+//  TObjArray of TObjStrings
+    fIdName = new TObjArray(fIdN);
+    fIdName->AddAt(new TObjString("ITS1"),0);
+    fIdName->AddAt(new TObjString("ITS2"),1);
+    fIdName->AddAt(new TObjString("ITS3"),2);
+    fIdName->AddAt(new TObjString("ITS4"),3);
+    fIdName->AddAt(new TObjString("ITS5"),4);
+    fIdName->AddAt(new TObjString("ITS6"),5);
+*/
+//  Array of TStrings.
+    fIdName    = new TString[fIdN];
+    fIdName[0] = "ITS1";
+    fIdName[1] = "ITS2";
+    fIdName[2] = "ITS3";
+    fIdName[3] = "ITS4";
+    fIdName[4] = "ITS5";
+    fIdName[5] = "ITS6";
+    fIdSens    = new Int_t[fIdN];
+    for (Int_t i=0;i<fIdN;i++) fIdSens[i] = 0;
+    fMajorVersion = 1;
+    fMinorVersion = 1;
 
 }
 //____________________________________________________________________________
@@ -261,7 +273,7 @@ void AliITSv1::CreateGeometry(){
   
   
   //     PARAMETERS FOR SMALL (1/2) ITS 
-
+/*
   for (i = 0; i < 6; ++i) {
     dzl[i] /= 2.;
     dzb[i] /= 2.;
@@ -273,8 +285,8 @@ void AliITSv1::CreateGeometry(){
   dzfc     /= 2.;
   zmax     /= 2.;
   xltpc    /= 2.;
-  acable    = 15.;
-  
+*/
+  acable    = 15.;  
   
   
   //     EQUAL DISTRIBUTION INTO THE 6 LAYERS 
@@ -895,6 +907,7 @@ void AliITSv1::StepManager(){
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
 */
 }
+/*
 //____________________________________________________________________________
 void AliITSv1::Streamer(TBuffer &R__b){
 ////////////////////////////////////////////////////////////////////////
@@ -911,3 +924,4 @@ void AliITSv1::Streamer(TBuffer &R__b){
       AliITS::Streamer(R__b);
    } // end if R__b.IsReading()
 }
+*/
\ No newline at end of file

diff --git a/ITS/AliITSv3.cxx b/ITS/AliITSv3.cxx
index fe39aa8018cfe3b3cce35a36384259a9910dd07c..5281afebc2a9db7f7f6e55c770cbf418d79b2c31 100644 (file)
--- a/ITS/AliITSv3.cxx
+++ b/ITS/AliITSv3.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.11.4.10  2000/07/31 13:50:51  barbera
+Updated from the release
+
 Revision 1.17  2000/07/10 16:07:19  fca
 Release version of ITS code
 
@@ -77,19 +80,17 @@ Introduction of the Copyright and cvs Log
 #include <TFile.h>    // only required for Tracking function?
 #include <TCanvas.h>
 #include <TObjArray.h>
+#include <TObjString.h>
 #include <TClonesArray.h>
 
 #include "AliMC.h"
-#include "AliMagF.h"
 #include "AliConst.h"
+#include "AliMagF.h"
 
 #include "AliITShit.h"
 #include "AliITSv3.h"
 #include "AliRun.h"
 
-#include "AliMC.h"
-#include "AliConst.h"
-
 ClassImp(AliITSv3)
  
 //_____________________________________________________________________________
@@ -98,17 +99,11 @@ AliITSv3::AliITSv3() {
 //    Standard default constructor for the ITS version 3.
 ////////////////////////////////////////////////////////////////////////
 
-    fIdN = 6;
-    fIdName = new TString[fIdN];
-    fIdName[0] = "ITS1";
-    fIdName[1] = "ITS2";
-    fIdName[2] = "ITS3";
-    fIdName[3] = "ITS4";
-    fIdName[4] = "ITS5";
-    fIdName[5] = "ITS6";
-    fIdSens    = new Int_t[fIdN];
-    for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
-    fMinorVersionV3=1;
+    fIdN    = 0;
+    fIdName = 0;
+    fIdSens = 0;
+    fMajorVersion = 3;
+    fMinorVersion = -1;
 }
 //____________________________________________________________________________
 AliITSv3::AliITSv3(const AliITSv3 &source){
@@ -139,8 +134,20 @@ AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){
 ////////////////////////////////////////////////////////////////////////
 //    Standard constructor for the ITS version 3.
 ////////////////////////////////////////////////////////////////////////
-    fIdN = 6;
-    fIdName = new TString[fIdN];
+
+    fIdN    = 6;
+/*
+//  TObjArray of TObjStrings
+    fIdName = new TObjArray(fIdN);
+    fIdName->AddAt(new TObjString("ITS1"),0);
+    fIdName->AddAt(new TObjString("ITS2"),1);
+    fIdName->AddAt(new TObjString("ITS3"),2);
+    fIdName->AddAt(new TObjString("ITS4"),3);
+    fIdName->AddAt(new TObjString("ITS5"),4);
+    fIdName->AddAt(new TObjString("ITS6"),5);
+*/
+//  Array of TStrings.
+    fIdName    = new TString[fIdN];
     fIdName[0] = "ITS1";
     fIdName[1] = "ITS2";
     fIdName[2] = "ITS3";
@@ -148,8 +155,9 @@ AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){
     fIdName[4] = "ITS5";
     fIdName[5] = "ITS6";
     fIdSens    = new Int_t[fIdN];
-    for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
-    fMinorVersionV3=1;
+    for (Int_t i=0;i<fIdN;i++) fIdSens[i] = 0;
+    fMajorVersion = 3;
+    fMinorVersion = 1;
 }//__________________________________________________________________________
 void AliITSv3::BuildGeometry(){
 ////////////////////////////////////////////////////////////////////////
@@ -2469,7 +2477,7 @@ void AliITSv3::CreateGeometry(){
   
   // --- Define SSD with the 35+39 lay-out 
   
-  if (fMinorVersionV3 < 3) {
+  if (fMinorVersion < 3) {
     
     //--- Define ghost volume containing the Strip Detectors and fill it with air
     //     or vacuum 
@@ -3019,7 +3027,7 @@ void AliITSv3::CreateGeometry(){
   
   // --- Define SSD with the 32+36 lay-out 
   
-  if (fMinorVersionV3 >2 && fMinorVersionV3 < 6) {
+  if (fMinorVersion >2 && fMinorVersion < 6) {
     
     //--- Define ghost volume containing the Strip Detectors and fill it with air
     //     or vacuum 
@@ -3586,7 +3594,7 @@ void AliITSv3::CreateGeometry(){
   
   //      GOTO 8901                                    ! skip outer wall 
   
-  if (fMinorVersionV3 == 0 || fMinorVersionV3 == 3) {
+  if (fMinorVersion == 0 || fMinorVersion == 3) {
     
     dits[0] = 49.9;
     dits[1] = dits[0] + .06926;
@@ -3602,7 +3610,7 @@ void AliITSv3::CreateGeometry(){
   
   //     GOTO 9012                                    ! skip octagonal frame
   
-  if (fMinorVersionV3 == 1) {
+  if (fMinorVersion == 1) {
     
     rzero    = 34.;
     dtra[0]  = .92;
@@ -3766,7 +3774,7 @@ void AliITSv3::CreateGeometry(){
     gMC->Gspos(knatra1[15], 1, "ITSV", xpos, ypos, zpos, idrotm[5115], "ONLY");
     
     
-  } else if (fMinorVersionV3 == 4) {
+  } else if (fMinorVersion == 4) {
     
     
     rzero    = 34.;
@@ -3938,7 +3946,7 @@ void AliITSv3::CreateGeometry(){
   
   //     GOTO 9123                                    ! skip hexagonal frame
   
-  if (fMinorVersionV3 == 2) {
+  if (fMinorVersion == 2) {
     
     rzero    = 33.5;
     dtra2[0] = .92;
@@ -4170,7 +4178,7 @@ void AliITSv3::CreateGeometry(){
     gMC->Gspos(knatra4[15], 1, "ITSV", xpos, ypos, zpos, idrotm[5225], "ONLY");
     
     
-  } else if (fMinorVersionV3 == 5) {
+  } else if (fMinorVersion == 5) {
     
     
     rzero    = 33.5;
@@ -4482,7 +4490,7 @@ void AliITSv3::CreateGeometry(){
   gMC->Gsvolu("RP04", "PGON", idtmed[274], dpgon, 10);
   gMC->Gspos("RP04", 1, "ITSV", xpos, ypos, zpos, 0, "ONLY");
   
-  if (fMinorVersionV3 < 3 ) {
+  if (fMinorVersion < 3 ) {
     offset2  = 5.2;
     dpgon[0] = offset2 + 360./(2.*35.);
     dpgon[1] = 360.;
@@ -4520,7 +4528,7 @@ void AliITSv3::CreateGeometry(){
     gMC->Gsvolu("RP06", "PGON", idtmed[274], dpgon, 10);
     gMC->Gspos("RP06", 1, "ITSV", xpos, ypos, zpos, 0, "ONLY");
   }
-  if (fMinorVersionV3 > 2 && fMinorVersionV3 < 6) {
+  if (fMinorVersion > 2 && fMinorVersion < 6) {
     offset2  = 5.2;
     dpgon[0] = offset2 + 5.625;
     dpgon[1] = 360.;
@@ -4637,7 +4645,7 @@ void AliITSv3::CreateGeometry(){
   gMC->Gsvolu("LP04", "PGON", idtmed[274], dpgon, 10);
   gMC->Gspos("LP04", 1, "ITSV", xpos, ypos, zpos, 0, "ONLY");
   
-  if (fMinorVersionV3 < 3) {
+  if (fMinorVersion < 3) {
     offset2  = 5.2;
     dpgon[0] = offset2 + 360./(2.*35.);
     dpgon[1] = 360.;
@@ -4675,7 +4683,7 @@ void AliITSv3::CreateGeometry(){
     gMC->Gsvolu("LP06", "PGON", idtmed[274], dpgon, 10);
     gMC->Gspos("LP06", 1, "ITSV", xpos, ypos, zpos, 0, "ONLY");
   }
-  if (fMinorVersionV3 > 2 && fMinorVersionV3 < 6) {
+  if (fMinorVersion > 2 && fMinorVersion < 6) {
     offset2  = 5.2;
     dpgon[0] = offset2 + 5.625;
     dpgon[1] = 360.;
@@ -4721,8 +4729,7 @@ void AliITSv3::CreateGeometry(){
   
   if (fEuclidOut) {
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
-  }
-  fMinorVersion = fMinorVersionV3;
+  };
 } 
 //_____________________________________________________________________________
 void AliITSv3::CreateMaterials(){
@@ -4915,7 +4922,6 @@ void AliITSv3::Init(){
 
     AliITS::Init();
     fMajorVersion = 3;
-    fMinorVersion = fMinorVersionV3;
 }
 //_____________________________________________________________________________
 void AliITSv3::StepManager(){
@@ -5055,6 +5061,7 @@ void AliITSv3::StepManager(){
   } // end if printit[layer][ladder][detector]
 #endif
 }
+/*
 //____________________________________________________________________________
 void AliITSv3::Streamer(TBuffer &R__b){
 ////////////////////////////////////////////////////////////////////////
@@ -5075,5 +5082,4 @@ void AliITSv3::Streamer(TBuffer &R__b){
       AliITS::Streamer(R__b);
    } // end if R__b.IsReading()
 }
-
-
+*/
\ No newline at end of file

diff --git a/ITS/AliITSv3.h b/ITS/AliITSv3.h
index 3a352e400dac7e99b955f7976e7e79556a4487e6..c33600154d05fa1a74932b8c4b6dfe6c37e68b7b 100644 (file)
--- a/ITS/AliITSv3.h
+++ b/ITS/AliITSv3.h
@@ -29,13 +29,9 @@ class AliITSv3 : public AliITS {
     }
     virtual void   SetMinorVersion(Int_t version) {
       // sets the minor version 
-      fMinorVersionV3=version;
+      fMinorVersion=version;
     }
     virtual void   StepManager();
-
- protected:
-    Int_t fMinorVersionV3;  //Minor version identifier
-
    
     ClassDef(AliITSv3,1)//Hits manager for set:ITS version 3, TP detailed geometry
 };

diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx
index a4b7ee7726444eebff87226bbd59ad508d14a3f7..3ed19ee117c3324d667468f364d74442dc5dd632 100644 (file)
--- a/ITS/AliITSv5.cxx
+++ b/ITS/AliITSv5.cxx
@@ -15,9 +15,6 @@
 
 /*
 $Log$
-Revision 1.23  2000/10/02 16:35:23  barbera
-Forward declarations added
-
 Revision 1.14.4.12  2000/10/02 16:04:03  barbera
 Forward declarations added
 
@@ -75,12 +72,13 @@ Introduction of the Copyright and cvs Log
 #include <TFile.h>    // only required for Tracking function?
 #include <TCanvas.h>
 #include <TObjArray.h>
+#include <TObjString.h>
 #include <TClonesArray.h>
 #include <TBRIK.h>
+#include <TSystem.h>
 
-#include "AliRun.h"
 #include "AliMC.h"
-#include "TSystem.h"
+#include "AliRun.h"
 #if ALIITSPRINTGEOM==1
 #include "../TGeant3/TGeant3.h"
 #endif
@@ -97,17 +95,11 @@ AliITSv5::AliITSv5() {
 //    Standard default constructor for the ITS version 5.
 ////////////////////////////////////////////////////////////////////////
 
-    fIdN = 6;
-    fIdName = new TString[fIdN];
-    fIdName[0] = "ITS1";
-    fIdName[1] = "ITS2";
-    fIdName[2] = "ITS3";
-    fIdName[3] = "ITS4";
-    fIdName[4] = "ITS5";
-    fIdName[5] = "ITS6";
-    fIdSens    = new Int_t[fIdN];
-    for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+    fIdN    = 0;
+    fIdName = 0;
+    fIdSens = 0;
     fMajorVersion = 5;
+    fMinorVersion = -1;
 }
 //____________________________________________________________________________
 AliITSv5::AliITSv5(const AliITSv5 &source){
@@ -140,8 +132,19 @@ AliITSv5::AliITSv5(const char *name, const char *title) : AliITS(name, title){
 ////////////////////////////////////////////////////////////////////////
 //    Standard constructor for the ITS version 5.
 ////////////////////////////////////////////////////////////////////////
-    fIdN = 6;
-    fIdName = new TString[fIdN];
+    fIdN    = 6;
+/*
+//  TObjArray of TObjStrings
+    fIdName = new TObjArray(fIdN);
+    fIdName->AddAt(new TObjString("ITS1"),0);
+    fIdName->AddAt(new TObjString("ITS2"),1);
+    fIdName->AddAt(new TObjString("ITS3"),2);
+    fIdName->AddAt(new TObjString("ITS4"),3);
+    fIdName->AddAt(new TObjString("ITS5"),4);
+    fIdName->AddAt(new TObjString("ITS6"),5);
+*/
+//  Array of TStrings.
+    fIdName    = new TString[fIdN];
     fIdName[0] = "ITS1";
     fIdName[1] = "ITS2";
     fIdName[2] = "ITS3";
@@ -149,8 +152,9 @@ AliITSv5::AliITSv5(const char *name, const char *title) : AliITS(name, title){
     fIdName[4] = "ITS5";
     fIdName[5] = "ITS6";
     fIdSens    = new Int_t[fIdN];
-    for (Int_t i=0;i<fIdN;i++) fIdSens[i]=fIdName[i].Length();
+    for (Int_t i=0;i<fIdN;i++) fIdSens[i] = 0;
     fMajorVersion = 5;
+    fMinorVersion = 1;
 
     fEuclidMaterial = "$ALICE_ROOT/Euclid/ITSgeometry_5.tme";
     fEuclidGeometry = "$ALICE_ROOT/Euclid/ITSgeometry_5.euc";
@@ -748,6 +752,7 @@ void AliITSv5::StepManager(){
 #endif
   return;
 }
+/*
 //____________________________________________________________________________
 void AliITSv5::Streamer(TBuffer &R__b){
 ////////////////////////////////////////////////////////////////////////
@@ -768,3 +773,4 @@ void AliITSv5::Streamer(TBuffer &R__b){
       AliITS::Streamer(R__b);
    } // end if R__b.IsReading()
 }
+*/
\ No newline at end of file