Corrections in reading Euclid files

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index bf2cea2e00764cb3c5186e65ddc5c15c64141547..7fa4bbe064123bac100ce6e316a46e2148ab06c1 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -61,8 +61,10 @@ public:
   virtual Int_t IsVersion() const =0;
 
   // Other methods
-  virtual void        AddDigit(Int_t*, Int_t*){}
-  virtual void        AddHit(Int_t, Int_t*, Float_t *) {}
+  virtual void        AddDigit(Int_t*, Int_t*){
+  Error("AddDigit","Digits cannot be added to module %s\n",fName.Data());}
+  virtual void        AddHit(Int_t, Int_t*, Float_t *) {
+  Error("AddDigit","Hits cannot be added to module %s\n",fName.Data());}
   virtual void        Browse(TBrowser *) {}
   virtual void        CreateGeometry() {}
   virtual void        CreateMaterials() {}
@@ -73,7 +75,7 @@ public:
   virtual void        PostTrack(){}
   virtual void        FinishEvent() {}
   virtual void        FinishRun() {}
-  virtual void        Hits2Digits() {}
+  //virtual void        Hits2Digits() {}
   virtual void        Init() {}
   virtual void        LoadPoints(Int_t ) {}
   virtual void        MakeBranch(Option_t *) {}
@@ -85,8 +87,8 @@ public:
   virtual void        SetTimeGate(Float_t) {}
   virtual Float_t     GetTimeGate() {return 1.e10;}
   virtual void        StepManager() {}
-  virtual AliHit*     FirstHit(Int_t) {return 0;}
-  virtual AliHit*     NextHit() {return 0;}
+  //virtual AliHit*     FirstHit(Int_t) {return 0;}
+  //virtual AliHit*     NextHit() {return 0;}
   virtual void        SetBufferSize(Int_t) {}  
   virtual void        SetEuclidFile(char*,char*geometry=0);
  

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 55039542bca45338a1a67914e12602bb965e050a..60e1ae67a0a7c2d95e296a2cde3ef15e6173aa2f 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -1530,7 +1530,7 @@ void AliRun::ReadEuclid(const char* filnam, const AliModule *det, const char* to
       printf(" *** GREUCL *** warning: %s is another possible top volume\n",volst[i]);
     }
     if (istop[i] && !flag) {
-      topvol=volst[i];
+      strcpy(topvol,volst[i]);
       printf(" *** GREUCL *** volume %s taken as a top volume\n",topvol);
       flag=1;
     }

diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx
index 74606521b67154186a1fc3c9b8ff2126b8479917..77ef9651cd049be7c18ba5fdb63c86280664d390 100644 (file)
--- a/STRUCT/AliFRAMEv0.cxx
+++ b/STRUCT/AliFRAMEv0.cxx
@@ -23,14 +23,15 @@ AliFRAMEv0::AliFRAMEv0()
 AliFRAMEv0::AliFRAMEv0(const char *name, const char *title)
   : AliFRAME(name,title)
 {
-  printf("Create FRAMEv0 object");  
+  printf("Create FRAMEv0 object\n");  
+  fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame0399.euc";
+  fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";
 }
 
  
 //___________________________________________
 void AliFRAMEv0::CreateGeometry()
 {
-  printf("Create FRAMEv0 geometry ");
 //Begin_Html
 /*
 <img src="picts/frame.gif">
@@ -45,21 +46,20 @@ void AliFRAMEv0::CreateGeometry()
 //End_Html
 
   char *filetmp;
-  const char *framename = "$(ALICE_ROOT)/Euclid/frame0399.euc";
   char topvol[5];
-  printf("Create FRAMEv0 geometry ");
   
 //
 // The Space frame
-  filetmp = gSystem->ExpandPathName(framename);
+  filetmp = gSystem->ExpandPathName(fEuclidGeometry.Data());
   FILE *file = fopen(filetmp,"r");
   delete [] filetmp;
   if(file) {
     fclose(file);
-    printf(" Reading FRAME \n");
-    gAlice->ReadEuclid(framename,this,topvol);
+    printf(" Reading FRAME geometry\n");
+    gAlice->ReadEuclid(fEuclidGeometry.Data(),this,topvol);
   } else {
-    Warning("CreateGeometry","The Euclid file %s does not exist!\n",framename);
+    Warning("CreateGeometry","The Euclid file %s does not exist!\n",
+           fEuclidGeometry.Data());
     exit(1);
   }
 //
@@ -67,10 +67,10 @@ void AliFRAMEv0::CreateGeometry()
 //    and make it invisible
 // 
 //  AliMatrix(idrotm[2001],90.,0.,90.,90.,180.,0.);
-  
-  gMC->Gspos("B010",1,"ALIC",0,0,0,0,"ONLY");
 
-  gMC->Gsatt("B010", "SEEN", 0);
+  gMC->Gspos(topvol,1,"ALIC",0,0,0,0,"ONLY");
+
+  gMC->Gsatt(topvol, "SEEN", 0);
 }
 
  
@@ -78,16 +78,16 @@ void AliFRAMEv0::CreateGeometry()
 void AliFRAMEv0::CreateMaterials()
 {
   char *filetmp;
-  printf("Create FRAMEv0 materials");
-  const char *name = "$(ALICE_ROOT)/Euclid/frame.tme";
-  filetmp = gSystem->ExpandPathName(name);
+  printf("Create FRAMEv0 materials\n");
+  filetmp = gSystem->ExpandPathName(fEuclidMaterial.Data());
   FILE *file = fopen(filetmp,"r");
   delete [] filetmp;
   if(file) {
     fclose(file);
-    gAlice->ReadEuclidMedia(name,this);
+    gAlice->ReadEuclidMedia(fEuclidMaterial.Data(),this);
   } else {
-    Warning("CreateMaterials","The material file %s does not exist!\n",name);
+    Warning("CreateMaterials","The material file %s does not exist!\n",
+           fEuclidMaterial.Data());
     exit(1);
   }
 }