X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliFRAMEv0.cxx;h=ca472e5e3e1199bd4e56d9cc4a5ee784b2e3a139;hb=91366e58c55a57569700d92fdd9b61c89ece8aad;hp=01968108b9fab79f2ab5181a50930777ef8090f0;hpb=90a46d5ce300d219426bdc45be029428dea56d5f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx
index 01968108b9f..ca472e5e3e1 100644
--- a/STRUCT/AliFRAMEv0.cxx
+++ b/STRUCT/AliFRAMEv0.cxx
@@ -13,38 +13,32 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.9  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
-////////////////////////////////////////////////
-//  space frame class                            /
-////////////////////////////////////////////////
+//-------------------------------------------------------------------------
+//  Space frame class
+//  Reads the geometry from an Euclid file
+//  Author: A.Morsch
+//-------------------------------------------------------------------------
 
-#include <stdio.h> 
-#include <TMath.h>
-#include <TRandom.h>
-#include <TVector.h>
 #include "AliFRAMEv0.h"
 #include "AliRun.h"
-#include "stdlib.h"
-#include "AliMC.h"
 #include "TSystem.h"
+#include <TVirtualMC.h>
  
 ClassImp(AliFRAMEv0)
  
 //_____________________________________________________________________________
 AliFRAMEv0::AliFRAMEv0()
 {
+// Constructor
 }
 
 //_____________________________________________________________________________
 AliFRAMEv0::AliFRAMEv0(const char *name, const char *title)
   : AliFRAME(name,title)
 {
+// Constructor
   printf("Create FRAMEv0 object\n");  
   fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame1099h.euc";
   fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";
@@ -78,7 +72,7 @@ void AliFRAMEv0::CreateGeometry()
   if(file) {
     fclose(file);
     printf(" Reading FRAME geometry\n");
-    gAlice->ReadEuclid(fEuclidGeometry.Data(),this,topvol);
+    ReadEuclid(fEuclidGeometry.Data(),topvol);
   } else {
     Warning("CreateGeometry","The Euclid file %s does not exist!\n",
 	    fEuclidGeometry.Data());
@@ -99,6 +93,8 @@ void AliFRAMEv0::CreateGeometry()
 //___________________________________________
 void AliFRAMEv0::CreateMaterials()
 {
+// Create Geant materials
+//
   char *filetmp;
   printf("Create FRAMEv0 materials\n");
   filetmp = gSystem->ExpandPathName(fEuclidMaterial.Data());
@@ -106,7 +102,7 @@ void AliFRAMEv0::CreateMaterials()
   delete [] filetmp;
   if(file) {
     fclose(file);
-    gAlice->ReadEuclidMedia(fEuclidMaterial.Data(),this);
+    ReadEuclidMedia(fEuclidMaterial.Data());
   } else {
     Warning("CreateMaterials","The material file %s does not exist!\n",
 	    fEuclidMaterial.Data());
@@ -114,6 +110,23 @@ void AliFRAMEv0::CreateMaterials()
   }
 }
 
+//_____________________________________________________________________________
+void AliFRAMEv0::Init()
+{
+  //
+  // Initialise the module after the geometry has been defined
+  //
+
+  printf("**************************************"
+	 " FRAME "
+	 "**************************************\n");
+  printf("\n     Version 0 of FRAME initialised, "
+	 "with openings for PHOS and HMPID\n\n");
+  printf("**************************************"
+	 " FRAME "
+	 "**************************************\n");
+
+}