Merged ITS-working with HEAD. Improved some of the documentation and

compatibility.

diff --git a/ITS/AliITSv1.cxx b/ITS/AliITSv1.cxx
index 3e714897fab010e00f89bfa56d6b64fe439646ce..7bdec32765d0388097381ece38ffc75f417afb39 100644 (file)
--- a/ITS/AliITSv1.cxx
+++ b/ITS/AliITSv1.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.14.2.1  2000/03/04 23:45:19  nilsen
+Fixed up the comments/documentation.
+
+Revision 1.14  1999/11/25 06:52:56  fca
+Correct value of drca
+

 Revision 1.13.2.1  1999/11/25 06:52:21  fca
 Correct value of drca
 
 Revision 1.13.2.1  1999/11/25 06:52:21  fca
 Correct value of drca
 


@@ -67,9 +73,9 @@ ClassImp(AliITSv1)
  
 //_____________________________________________________________________________
 AliITSv1::AliITSv1() {
  
 //_____________________________________________________________________________
 AliITSv1::AliITSv1() {

-    //
-    // Default constructor for the ITS
-    //
+////////////////////////////////////////////////////////////////////////
+//    Standard default constructor for the ITS version 1.
+////////////////////////////////////////////////////////////////////////

     fId1N = 6;
     fId1Name = new char*[fId1N];
     fId1Name[0] = "ITS1";
     fId1N = 6;
     fId1Name = new char*[fId1N];
     fId1Name[0] = "ITS1";


@@ -79,12 +85,11 @@ AliITSv1::AliITSv1() {
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
 }
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
 }

-

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){ 
-    //
-    // Standard constructor for the ITS
-    //
+AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
+////////////////////////////////////////////////////////////////////////
+//    Standard constructor for the ITS version 1.
+////////////////////////////////////////////////////////////////////////

     fId1N = 6;
     fId1Name = new char*[fId1N];
     fId1Name[0] = "ITS1";
     fId1N = 6;
     fId1Name = new char*[fId1N];
     fId1Name[0] = "ITS1";


@@ -94,27 +99,18 @@ AliITSv1::AliITSv1(const char *name, const char *title) : AliITS(name, title){
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
 }
     fId1Name[4] = "ITS5";
     fId1Name[5] = "ITS6";
 }

- 

 //_____________________________________________________________________________
 AliITSv1::~AliITSv1() {
 //_____________________________________________________________________________
 AliITSv1::~AliITSv1() {

-    //
-    // Standard destructor for the ITS
-    //
+////////////////////////////////////////////////////////////////////////
+//    Standard destructor for the ITS version 1.
+////////////////////////////////////////////////////////////////////////

   delete [] fId1Name;
 }
   delete [] fId1Name;
 }

-

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-void AliITSv1::CreateGeometry()
-{
-  //
-  // Create geometry for version 1 of the ITS
-  //
-  //
-  // Create Geometry for ITS version 0
-  //
-  //
-  
-
+void AliITSv1::CreateGeometry(){
+////////////////////////////////////////////////////////////////////////
+//    This routine defines and Creates the geometry for version 1 of the ITS.
+////////////////////////////////////////////////////////////////////////

   
   Float_t drcer[6] = { 0.,0.,.08,.08,0.,0. };           //CERAMICS THICKNESS
   Float_t drepx[6] = { 0.,0.,0.,0.,.5357,.5357 };       //EPOXY THICKNESS
   
   Float_t drcer[6] = { 0.,0.,.08,.08,0.,0. };           //CERAMICS THICKNESS
   Float_t drepx[6] = { 0.,0.,0.,0.,.5357,.5357 };       //EPOXY THICKNESS


@@ -491,21 +487,18 @@ void AliITSv1::CreateGeometry()
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
 }
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
 }

-

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-void AliITSv1::CreateMaterials()
-{
-  //
-  // Create the materials for ITS
-  //
+void AliITSv1::CreateMaterials(){
+////////////////////////////////////////////////////////////////////////
+//     Create Materials for ITS as defined in AliITS::CreateMaterials().
+////////////////////////////////////////////////////////////////////////

   AliITS::CreateMaterials();
 }
   AliITS::CreateMaterials();
 }

-

 //_____________________________________________________________________________
 void AliITSv1::Init(){
 //_____________________________________________________________________________
 void AliITSv1::Init(){

-    //
-    // Initialise the ITS after it has been built
-    //
+////////////////////////////////////////////////////////////////////////
+//     Initialise the ITS after it has been created.
+////////////////////////////////////////////////////////////////////////

     Int_t i,j,l;
 
     fIdN       = fId1N;;
     Int_t i,j,l;
 
     fIdN       = fId1N;;


@@ -524,12 +517,10 @@ void AliITSv1::Init(){
 }  
  
 //_____________________________________________________________________________
 }  
  
 //_____________________________________________________________________________

-void AliITSv1::DrawModule()
-{ 
-  //
-  // Draw a shaded view of the FMD version 1
-  //
-
+void AliITSv1::DrawModule(){
+////////////////////////////////////////////////////////////////////////
+//     Draw a shaded view of the FMD version 1.
+////////////////////////////////////////////////////////////////////////

   
   // Set everything unseen
   gMC->Gsatt("*", "seen", -1);
   
   // Set everything unseen
   gMC->Gsatt("*", "seen", -1);


@@ -574,13 +565,12 @@ void AliITSv1::DrawModule()
   gMC->Gdhead(1111, "Inner Tracking System Version 1");
   gMC->Gdman(17, 6, "MAN");
 }
   gMC->Gdhead(1111, "Inner Tracking System Version 1");
   gMC->Gdman(17, 6, "MAN");
 }

-

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-void AliITSv1::StepManager()
-{ 
-  //
-  // Called at every step in the ITS
-  //
+void AliITSv1::StepManager(){
+////////////////////////////////////////////////////////////////////////
+//    Called for every step in the ITS, then calles the AliITShit class
+// creator with the information to be recoreded about that hit.
+////////////////////////////////////////////////////////////////////////

   Int_t         copy, id;
   Float_t       hits[8];
   Int_t         vol[4];
   Int_t         copy, id;
   Float_t       hits[8];
   Int_t         vol[4];


@@ -598,7 +588,7 @@ void AliITSv1::StepManager()
   if(gMC->IsTrackAlive())       vol[3] += 64;
   //
   // Fill hit structure.
   if(gMC->IsTrackAlive())       vol[3] += 64;
   //
   // Fill hit structure.

-  if(gMC->TrackCharge() && gMC->Edep()) {
+  if( !(gMC->TrackCharge()) ) return;

     //
     // Only entering charged tracks
     if((id=gMC->CurrentVolID(copy))==fIdSens[0]) {  
     //
     // Only entering charged tracks
     if((id=gMC->CurrentVolID(copy))==fIdSens[0]) {  


@@ -645,13 +635,14 @@ void AliITSv1::StepManager()
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);

-  }      

 }
 }

-

 //____________________________________________________________________________
 //____________________________________________________________________________

-void AliITSv1::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliITSv1.
+void AliITSv1::Streamer(TBuffer &R__b){
+////////////////////////////////////////////////////////////////////////
+//    A dummy Streamer function for this class AliITSv1. By default it
+// only streams the AliITS class as it is required. Since this class
+// dosen't contain any "real" data to be saved, it doesn't.
+////////////////////////////////////////////////////////////////////////

 
    if (R__b.IsReading()) {
       Version_t R__v = R__b.ReadVersion(); if (R__v) { }
 
    if (R__b.IsReading()) {
       Version_t R__v = R__b.ReadVersion(); if (R__v) { }


@@ -667,5 +658,5 @@ void AliITSv1::Streamer(TBuffer &R__b)
       // into this class via its creators.
       //R__b << fId1N;
       //R__b.WriteArray(fId1Name, __COUNTER__);
       // into this class via its creators.
       //R__b << fId1N;
       //R__b.WriteArray(fId1Name, __COUNTER__);

-   }
+   } // end if R__b.IsReading()

 }
 }

diff --git a/ITS/AliITSv1.h b/ITS/AliITSv1.h
index 2d5eeffa8eb13983f54d7170dde02d29a6278abe..88e79f8a84fddda8f239b83c78383659cd3fd266 100644 (file)
--- a/ITS/AliITSv1.h
+++ b/ITS/AliITSv1.h
@@ -1,5 +1,5 @@
-#ifndef ITSv1_H
-#define ITSv1_H
+#ifndef ALIITSV1_H
+#define ALIITSV1_H

 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 


@@ -10,6 +10,7 @@
 /////////////////////////////////////////////////////////
  
 #include "AliITS.h"
 /////////////////////////////////////////////////////////
  
 #include "AliITS.h"

+#include "AliITSgeom.h"

  
 class AliITSv1 : public AliITS {
 
  
 class AliITSv1 : public AliITS {
 


@@ -29,7 +30,7 @@ public:
   virtual void   DrawModule();
   virtual void   StepManager();
   
   virtual void   DrawModule();
   virtual void   StepManager();
   

-   ClassDef(AliITSv1,1)  //Hits manager for set:ITS version 1
+   ClassDef(AliITSv1,1)  //Hits manager for set:ITS version 1 cource Geometry

 };
  
 #endif
 };
  
 #endif

diff --git a/ITS/AliITSv3.cxx b/ITS/AliITSv3.cxx
index 9b7da5061f3a28ebe96ea5144c375ec301a0c42b..d0f154435e35196edba195edc7c4d32aa027fcf2 100644 (file)
--- a/ITS/AliITSv3.cxx
+++ b/ITS/AliITSv3.cxx
@@ -15,6 +15,16 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.11.4.2  2000/03/04 23:46:02  nilsen
+Fixed up the comments/documentation.
+
+Revision 1.11.4.1  2000/01/12 19:03:33  nilsen
+This is the version of the files after the merging done in December 1999.
+See the ReadMe110100.txt file for details
+
+Revision 1.11  1999/10/22 08:25:25  fca
+remove double definition of destructors
+

 Revision 1.10  1999/10/22 08:16:49  fca
 Correct destructors, thanks to I.Hrivnacova
 
 Revision 1.10  1999/10/22 08:16:49  fca
 Correct destructors, thanks to I.Hrivnacova
 


@@ -30,10 +40,10 @@ Introduction of the Copyright and cvs Log
 */
 
 ///////////////////////////////////////////////////////////////////////////////
 */
 
 ///////////////////////////////////////////////////////////////////////////////

-//                                                                           //
-//  Inner Traking System version 3                                           //
-//  This class contains the base procedures for the Inner Tracking System    //
-//                                                                           //
+//
+//  Inner Traking System version 3
+//  This class contains the base procedures for the Inner Tracking System
+//

 // Authors: R. Barbera, A. Morsch.
 // version 3.
 // Created  1998.
 // Authors: R. Barbera, A. Morsch.
 // version 3.
 // Created  1998.


@@ -41,10 +51,13 @@ Introduction of the Copyright and cvs Log
 //  NOTE: THIS IS THE OLD detailed TP-like geometry of the ITS. THIS WILL NOT 
 // WORK with the geometry or module classes or any analysis classes. You are 
 // strongly encouraged to uses AliITSv5.
 //  NOTE: THIS IS THE OLD detailed TP-like geometry of the ITS. THIS WILL NOT 
 // WORK with the geometry or module classes or any analysis classes. You are 
 // strongly encouraged to uses AliITSv5.

-//                                                                           //
-//                                                                           //
+//

 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

- 
+
+// See AliITSv3::StepManager().
+#define ALIITSPRINTGEOM 0 // default. don't print out gemetry information
+//#define ALIITSPRINTGEOM 1 // print out geometry information
+

 #include <TMath.h>
 #include <TRandom.h>
 #include <TVector.h>
 #include <TMath.h>
 #include <TRandom.h>
 #include <TVector.h>


@@ -59,9 +72,9 @@ ClassImp(AliITSv3)
  
 //_____________________________________________________________________________
 AliITSv3::AliITSv3() {
  
 //_____________________________________________________________________________
 AliITSv3::AliITSv3() {

-    //
-    // Default constructor for ITS
-    //
+////////////////////////////////////////////////////////////////////////
+//    Standard default constructor for the ITS version 3.
+////////////////////////////////////////////////////////////////////////

     fId3N = 6;
     fId3Name = new char*[fId3N];
     fId3Name[0] = "ITS1";
     fId3N = 6;
     fId3Name = new char*[fId3N];
     fId3Name[0] = "ITS1";


@@ -72,20 +85,19 @@ AliITSv3::AliITSv3() {
     fId3Name[5] = "ITS6";
     fMinorVersionV3=1;
 }
     fId3Name[5] = "ITS6";
     fMinorVersionV3=1;
 }

-

 //_____________________________________________________________________________
 AliITSv3::~AliITSv3() {
 //_____________________________________________________________________________
 AliITSv3::~AliITSv3() {

-    //
-    // Standard destructor for the ITS
-    //
+////////////////////////////////////////////////////////////////////////
+//    Standard destructor for the ITS version 3.
+////////////////////////////////////////////////////////////////////////

   delete [] fId3Name;
 }
 
 //_____________________________________________________________________________
 AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){
   delete [] fId3Name;
 }
 
 //_____________________________________________________________________________
 AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){

-    //
-    // Standard constructor for ITS
-    // 
+////////////////////////////////////////////////////////////////////////
+//    Standard constructor for the ITS version 3.
+////////////////////////////////////////////////////////////////////////

     fId3N = 6;
     fId3Name = new char*[fId3N];
     fId3Name[0] = "ITS1";
     fId3N = 6;
     fId3Name = new char*[fId3N];
     fId3Name[0] = "ITS1";


@@ -99,11 +111,9 @@ AliITSv3::AliITSv3(const char *name, const char *title) : AliITS(name, title){
  
 //_____________________________________________________________________________
 void AliITSv3::CreateGeometry(){
  
 //_____________________________________________________________________________
 void AliITSv3::CreateGeometry(){

-  //
-  // Create ITS geometry for version 3
-  //
-  //
-
+////////////////////////////////////////////////////////////////////////
+//    This routine creates and defines the version 3 geometry of the ITS.
+////////////////////////////////////////////////////////////////////////

   
   const Float_t xx[14] = {  0.000,  0.000,-14.002, -6.288,-25.212,-16.292,
                           -35.713,-26.401,-45.340,-36.772,-18.740,-12.814,
   
   const Float_t xx[14] = {  0.000,  0.000,-14.002, -6.288,-25.212,-16.292,
                           -35.713,-26.401,-45.340,-36.772,-18.740,-12.814,


@@ -4622,22 +4632,19 @@ void AliITSv3::CreateGeometry(){
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
   fMinorVersion = fMinorVersionV3;
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
   fMinorVersion = fMinorVersionV3;

-}
- 
+} 

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-void AliITSv3::CreateMaterials()
-{
-  //
-  // Create Materials for ITS
-  //
+void AliITSv3::CreateMaterials(){
+////////////////////////////////////////////////////////////////////////
+//     Create Materials for ITS as defined in AliITS::CreateMaterials().
+////////////////////////////////////////////////////////////////////////

    AliITS::CreateMaterials();
 }
    AliITS::CreateMaterials();
 }

-

 //_____________________________________________________________________________
 void AliITSv3::Init(){
 //_____________________________________________________________________________
 void AliITSv3::Init(){

-    //
-    // Initialise its after it is built
-    //
+////////////////////////////////////////////////////////////////////////
+//     Initialise the ITS after it has been created.
+////////////////////////////////////////////////////////////////////////

     Int_t i,j,l;
 
     fIdN       = fId3N;;
     Int_t i,j,l;
 
     fIdN       = fId3N;;


@@ -4653,19 +4660,36 @@ void AliITSv3::Init(){
     AliITS::Init();
     fMajorVersion = 3;
     fMinorVersion = fMinorVersionV3;
     AliITS::Init();
     fMajorVersion = 3;
     fMinorVersion = fMinorVersionV3;

-} 
-
+}

 //_____________________________________________________________________________
 //_____________________________________________________________________________

-void AliITSv3::StepManager()
-{
-  //
-  // Called at every step in ITS
-  //
+void AliITSv3::StepManager(){
+////////////////////////////////////////////////////////////////////////
+//    Called for every step in the ITS, then calles the AliITShit class
+// creator with the information to be recoreded about that hit.
+//     The value of the macro ALIITSPRINTGEOM if set to 1 will allow the
+// printing of information to a file which can be used to create a .det
+// file read in by the routine CreateGeometry(). If set to 0 or any other
+// value except 1, the default behavior, then no such file is created nor
+// it the extra variables and the like used in the printing allocated.
+////////////////////////////////////////////////////////////////////////

   Int_t         copy, id;
   Float_t       hits[8];
   Int_t         vol[4];
   TLorentzVector position, momentum;
   TClonesArray &lhits = *fHits;
   Int_t         copy, id;
   Float_t       hits[8];
   Int_t         vol[4];
   TLorentzVector position, momentum;
   TClonesArray &lhits = *fHits;

+#if ALIITSPRINTGEOM==1
+  FILE          *fp;
+  Int_t         i;
+  Float_t       xl[3],xt[3],angl[6];
+//  Float_t       par[20],att[20];
+  Float_t      mat[9];
+  static Bool_t first=kTRUE,printit[6][50][50];
+  if(first){ for(copy1=0;copy1<6;copy1++)for(copy2=0;copy2<50;copy2++)
+      for(id=0;id<50;id++) printit[copy1][copy2][id] = kTRUE;
+  first = kFALSE;
+  }
+  // end if first
+#endif

   //
   // Track status
   vol[3] = 0;
   //
   // Track status
   vol[3] = 0;


@@ -4678,7 +4702,7 @@ void AliITSv3::StepManager()
   if(gMC->IsTrackAlive())       vol[3] += 64;
   //
   // Fill hit structure.
   if(gMC->IsTrackAlive())       vol[3] += 64;
   //
   // Fill hit structure.

-  if(gMC->TrackCharge() && gMC->Edep()) {
+  if(!(gMC->TrackCharge())) return;

     //
     // Only entering charged tracks
     if((id=gMC->CurrentVolID(copy))==fIdSens[0]) {  
     //
     // Only entering charged tracks
     if((id=gMC->CurrentVolID(copy))==fIdSens[0]) {  


@@ -4725,21 +4749,73 @@ void AliITSv3::StepManager()
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
     hits[6]=gMC->Edep();
     hits[7]=gMC->TrackTime();
     new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);

-  }      
-}
+#if ALIITSPRINTGEOM==1
+  if(printit[vol[0]][vol[2]][vol[1]]){
+      printit[vol[0]][vol[2]][vol[1]] = kFALSE;
+      xl[0] = xl[1] = xl[2] = 0.0;
+      gMC->Gdtom(xl,xt,1);
+      for(i=0;i<9;i++) mat[i] = 0.0;
+      mat[0] = mat[4] = mat[8] = 1.0;  // default with identity matrix
+      xl[0] = 1.0;
+      xl[1] = xl[2] =0.0;
+      gMC->Gdtom(xl,&(mat[0]),2);
+      xl[1] = 1.0;
+      xl[0] = xl[2] =0.0;
+      gMC->Gdtom(xl,&(mat[3]),2);
+      xl[2] = 1.0;
+      xl[1] = xl[0] =0.0;
+      gMC->Gdtom(xl,&(mat[6]),2);

 
 

-//____________________________________________________________________________
-void AliITSv3::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliITSv3.
+      angl[0] = TMath::ACos(mat[2]);
+      if(mat[2]==1.0) angl[0] = 0.0;
+      angl[1] = TMath::ATan2(mat[1],mat[0]);
+      if(angl[1]<0.0) angl[1] += 2.0*TMath::Pi();
+
+      angl[2] = TMath::ACos(mat[5]);
+      if(mat[5]==1.0) angl[2] = 0.0;
+      angl[3] = TMath::ATan2(mat[4],mat[3]);
+      if(angl[3]<0.0) angl[3] += 2.0*TMath::Pi();

 
 

+      angl[4] = TMath::ACos(mat[8]);
+      if(mat[8]==1.0) angl[4] = 0.0;
+      angl[5] = TMath::ATan2(mat[7],mat[6]);
+      if(angl[5]<0.0) angl[5] += 2.0*TMath::Pi();
+
+      for(i=0;i<6;i++) angl[i] *= 180.0/TMath::Pi(); // degrees
+//      i = gMC->CurrentVolID(copy);
+//      gMC->Gfpara(gMC->CurrentVolName(),copy,1,copy1,copy2,par,att);
+      fp = fopen("ITSgeometry_v5.det","a");
+      fprintf(fp,"%2d %2d %2d %9e %9e %9e %9e %9e %9e %9e %9e %9e ",
+             vol[0],vol[2],vol[1], // layer ladder detector
+             xt[0],xt[1],xt[2],    // Translation vector
+             angl[0],angl[1],angl[2],angl[3],angl[4],angl[5] // Geant rotaion
+                                                           // angles (degrees)
+             );
+      fprintf(fp,"%9e %9e %9e %9e %9e %9e %9e %9e %9e",
+            mat[0],mat[1],mat[2],mat[3],mat[4],mat[5],mat[6],mat[7],mat[8]
+         );  // Adding the rotation matrix.
+      fprintf(fp,"\n");
+      fclose(fp);
+  } // end if printit[layer][ladder][detector]
+#endif
+}
+//____________________________________________________________________________
+void AliITSv3::Streamer(TBuffer &R__b){
+////////////////////////////////////////////////////////////////////////
+//    A dummy Streamer function for this class AliITSv3. By default it
+// only streams the AliITS class as it is required. Since this class
+// dosen't contain any "real" data to be saved, it doesn't.
+////////////////////////////////////////////////////////////////////////

    if (R__b.IsReading()) {
    if (R__b.IsReading()) {

-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      AliITS::Streamer(R__b);
-      // This information does not need to be read. It is "hard wired"
-      // into this class via its creators.
-      //R__b >> fId3N;
-      //R__b.ReadArray(fId3Name);
+      Version_t R__v = R__b.ReadVersion();
+      if (R__v==1) {
+         AliITS::Streamer(R__b);
+         // This information does not need to be read. It is "hard wired"
+         // into this class via its creators.
+         //R__b >> fId3N;
+         //R__b.ReadArray(fId3Name);
+      }else{
+      } // end if

    } else {
       R__b.WriteVersion(AliITSv3::IsA());
       AliITS::Streamer(R__b);
    } else {
       R__b.WriteVersion(AliITSv3::IsA());
       AliITS::Streamer(R__b);


@@ -4747,5 +4823,5 @@ void AliITSv3::Streamer(TBuffer &R__b)
       // into this class via its creators.
       //R__b << fId3N;
       //R__b.WriteArray(fId3Name, __COUNTER__);
       // into this class via its creators.
       //R__b << fId3N;
       //R__b.WriteArray(fId3Name, __COUNTER__);

-   }
+   } // end if R__b.IsReading()

 }
 }

diff --git a/ITS/AliITSv3.h b/ITS/AliITSv3.h
index 36686a68b4716e203f321ccd366500bcec569199..3664876299209d8ee8d1484ca662d227a375b8f1 100644 (file)
--- a/ITS/AliITSv3.h
+++ b/ITS/AliITSv3.h
@@ -1,5 +1,5 @@
-#ifndef ITSv3_H
-#define ITSv3_H
+#ifndef ALIITSV3_H
+#define ALIITSV3_H

 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 


@@ -10,6 +10,7 @@
 /////////////////////////////////////////////////////////
  
 #include "AliITS.h"
 /////////////////////////////////////////////////////////
  
 #include "AliITS.h"

+#include "AliITSgeom.h"

  
 class AliITSv3 : public AliITS {
 
  
 class AliITSv3 : public AliITS {
 


@@ -32,7 +33,8 @@ public:
    virtual void   SetMinorVersion(Int_t version) {fMinorVersionV3=version;}
    virtual void   StepManager();
    
    virtual void   SetMinorVersion(Int_t version) {fMinorVersionV3=version;}
    virtual void   StepManager();
    

-   ClassDef(AliITSv3,1)  //Hits manager for set:ITS version 3
+   ClassDef(AliITSv3,1)  //Hits manager for set:ITS version 3, TP detailed geometry

 };
  
 #endif
 };
  
 #endif

+

diff --git a/ITS/AliITSv5.h b/ITS/AliITSv5.h
index 4d2d4d3eb9f71a3c95bf760941c6175b0d9f9700..35370a5b3923f518036ad1bf07102254948b1339 100644 (file)
--- a/ITS/AliITSv5.h
+++ b/ITS/AliITSv5.h
@@ -1,5 +1,5 @@
-#ifndef ITSv5_H
-#define ITSv5_H
+#ifndef ALIITSV5_H
+#define ALIITSV5_H

 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 


@@ -30,7 +30,7 @@ public:
            virtual Int_t IsVersion() const {return 5;}
            virtual void  StepManager();
   
            virtual Int_t IsVersion() const {return 5;}
            virtual void  StepManager();
   

-  ClassDef(AliITSv5,1)  //Hits manager for ITS version 5
+  ClassDef(AliITSv5,1)  //Hits manager for ITS version 5 Official detailed geometry

 };
  
 #endif
 };
  
 #endif