Transition to NewIO

[u/mrichter/AliRoot.git] / STRUCT / AliFRAMEv1.cxx

diff --git a/STRUCT/AliFRAMEv1.cxx b/STRUCT/AliFRAMEv1.cxx
index 305793c70008b3f3d525bac86352548d96b302e6..0d1132ed7164f66dde1ae6d0944c6d3a5bf9716c 100644 (file)
--- a/STRUCT/AliFRAMEv1.cxx
+++ b/STRUCT/AliFRAMEv1.cxx
@@ -13,36 +13,33 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.7  1999/11/01 20:42:42  fca
-FRAME version 1 is now the symmetric one.
-
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
+/* $Id$ */
 
-*/
+//-------------------------------------------------------------------------
+//  AliFRAMEv1.cxx
+//  symmetric space frame without holes
+//  Author:
+//-------------------------------------------------------------------------
 
-////////////////////////////////////////////////
-//  space frame class                            /
-////////////////////////////////////////////////
+#include <TSystem.h>
 
 #include "AliFRAMEv1.h"
 #include "AliRun.h"
-#include "TSystem.h"
  
 ClassImp(AliFRAMEv1)
  
 //_____________________________________________________________________________
 AliFRAMEv1::AliFRAMEv1()
 {
+// Constructor
 }
 
 //_____________________________________________________________________________
 AliFRAMEv1::AliFRAMEv1(const char *name, const char *title)
   : AliFRAME(name,title)
 {
-  printf("Create FRAMEv1 object\n");  
+// Constructor
+  if(fDebug>1) printf("%s: Create FRAMEv1 object\n",ClassName());  
   fEuclidGeometry="$(ALICE_ROOT)/Euclid/frame1099i.euc";
   fEuclidMaterial="$(ALICE_ROOT)/Euclid/frame.tme";
 }
@@ -74,13 +71,11 @@ void AliFRAMEv1::CreateGeometry()
   delete [] filetmp;
   if(file) {
     fclose(file);
-    printf(" Reading FRAME geometry\n");
+    if(fDebug) printf("%s: Reading FRAME geometry\n",ClassName());
     ReadEuclid(fEuclidGeometry.Data(),topvol);
-  } else {
-    Warning("CreateGeometry","The Euclid file %s does not exist!\n",
-           fEuclidGeometry.Data());
-    exit(1);
-  }
+  } else 
+    Fatal("CreateGeometry","The Euclid file %s does not exist!\n",
+         fEuclidGeometry.Data());
 //
 // --- Place the FRAME ghost volume (B010) in its mother volume (ALIC)
 //    and make it invisible
@@ -96,8 +91,9 @@ void AliFRAMEv1::CreateGeometry()
 //___________________________________________
 void AliFRAMEv1::CreateMaterials()
 {
+// Create materials and media (from Euclid file)
   char *filetmp;
-  printf("Create FRAMEv1 materials\n");
+  if(fDebug) printf("%s: Create FRAMEv1 materials\n",ClassName());
   filetmp = gSystem->ExpandPathName(fEuclidMaterial.Data());
   FILE *file = fopen(filetmp,"r");
   delete [] filetmp;
@@ -118,12 +114,13 @@ void AliFRAMEv1::Init()
   // Initialise the module after the geometry has been defined
   //
 
-  printf("**************************************"
-        " FRAME "
-        "**************************************\n");
-  printf("\n     Version 1 of FRAME initialised, symmetric FRAME\n\n");
-  printf("**************************************"
-        " FRAME "
-        "**************************************\n");
-
+  if(fDebug) {
+    printf("%s: **************************************"
+          " FRAME "
+          "**************************************\n",ClassName());
+    printf("\n%s:      Version 1 of FRAME initialised, symmetric FRAME\n\n",ClassName());
+    printf("%s: **************************************"
+          " FRAME "
+          "**************************************\n",ClassName());
+  }
 }