Index: trunk/MagicSoft/Simulation/Corsika/Simone/Makefile
===================================================================
--- trunk/MagicSoft/Simulation/Corsika/Simone/Makefile	(revision 417)
+++ trunk/MagicSoft/Simulation/Corsika/Simone/Makefile	(revision 418)
@@ -19,7 +19,7 @@
 #
 # $RCSfile: Makefile,v $
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 # $Author: harald $ 
-# $Date: 2000-07-06 10:24:00 $
+# $Date: 2000-07-12 10:19:10 $
 #
 ##################################################################
@@ -168,103 +168,49 @@
 ../../Detector/include-CORSIKA/COREventHeader.o: ../../Detector/include-CORSIKA/COREventHeader.hxx
 ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/stdlib.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/features.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/cdefs.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/gnu/stubs.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
+../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/standards.h
+../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/getopt.h
 ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/types.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/types.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/time.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/endian.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/endian.h
+../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/mach/machine/vm_types.h
 ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/select.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/select.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/sigset.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/sysmacros.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/alloca.h
 ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/math.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/huge_val.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/mathdef.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/mathcalls.h
-../../Detector/include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h
 ../../Detector/include-CORSIKA/CORParticle.o: ../../Detector/include-CORSIKA/CORParticle.hxx
 ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/stdlib.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/features.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/cdefs.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/gnu/stubs.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
+../../Detector/include-CORSIKA/CORParticle.o: /usr/include/standards.h
+../../Detector/include-CORSIKA/CORParticle.o: /usr/include/getopt.h
 ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/types.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/types.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/time.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/endian.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/endian.h
+../../Detector/include-CORSIKA/CORParticle.o: /usr/include/mach/machine/vm_types.h
 ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/select.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/select.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/sigset.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/sysmacros.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/alloca.h
 ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/math.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/huge_val.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/mathdef.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/mathcalls.h
-../../Detector/include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h
 ../../Detector/include-CORSIKA/CORStatfile.o: ../../Detector/include-CORSIKA/CORStatfile.hxx
 ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/stdlib.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/features.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/cdefs.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/gnu/stubs.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
+../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/standards.h
+../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/getopt.h
 ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/types.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/types.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/time.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/endian.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/endian.h
+../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/mach/machine/vm_types.h
 ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/select.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/select.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/sigset.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/sysmacros.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/alloca.h
 ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/math.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/huge_val.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/mathdef.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/mathcalls.h
-../../Detector/include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h
-MSimone.o: MSimone.hxx /usr/include/stdlib.h /usr/include/features.h
-MSimone.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-MSimone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
-MSimone.o: /usr/include/sys/types.h /usr/include/bits/types.h
-MSimone.o: /usr/include/time.h /usr/include/endian.h
-MSimone.o: /usr/include/bits/endian.h /usr/include/sys/select.h
-MSimone.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-MSimone.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
-MSimone.o: /usr/include/stdio.h
-MSimone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h
-MSimone.o: /usr/include/libio.h /usr/include/_G_config.h
-MSimone.o: /usr/include/bits/stdio_lim.h /usr/include/string.h
-MSimone.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-MSimone.o: /usr/include/bits/confname.h /usr/include/getopt.h
-MSimone.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+MSimone.o: MSimone.hxx /usr/include/stdlib.h /usr/include/standards.h
+MSimone.o: /usr/include/getopt.h /usr/include/sys/types.h
+MSimone.o: /usr/include/mach/machine/vm_types.h /usr/include/sys/select.h
+MSimone.o: /usr/include/stdio.h /usr/include/sys/seek.h
+MSimone.o: /usr/include/va_list.h /usr/include/sys/limits.h
+MSimone.o: /usr/include/sys/machine/machlimits.h /usr/include/sys/syslimits.h
+MSimone.o: /usr/include/sys/machine/machtime.h /usr/include/sys/rt_limits.h
+MSimone.o: /usr/include/string.h /usr/include/strings.h /usr/include/unistd.h
+MSimone.o: /usr/include/sys/access.h /usr/include/fcntl.h
+MSimone.o: /usr/include/sys/fcntl.h /usr/include/sys/mode.h
 MSimone.o: ../../Detector/include-CORSIKA/COREventHeader.hxx
-MSimone.o: /usr/include/math.h /usr/include/bits/huge_val.h
-MSimone.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
-MSimone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h
-simone.o: /usr/include/stdlib.h /usr/include/features.h
-simone.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-simone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h
-simone.o: /usr/include/sys/types.h /usr/include/bits/types.h
-simone.o: /usr/include/time.h /usr/include/endian.h
-simone.o: /usr/include/bits/endian.h /usr/include/sys/select.h
-simone.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-simone.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
+MSimone.o: /usr/include/math.h
+simone.o: /usr/include/stdlib.h /usr/include/standards.h
+simone.o: /usr/include/getopt.h /usr/include/sys/types.h
+simone.o: /usr/include/mach/machine/vm_types.h /usr/include/sys/select.h
 simone.o: ../../Detector/include-CORSIKA/COREventHeader.hxx
-simone.o: /usr/include/math.h /usr/include/bits/huge_val.h
-simone.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h
-simone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h
-simone.o: ../../Detector/include-CORSIKA/CORParticle.hxx
+simone.o: /usr/include/math.h ../../Detector/include-CORSIKA/CORParticle.hxx
 simone.o: ../../Detector/include-CORSIKA/CORStatfile.hxx MSimone.hxx
-simone.o: /usr/include/stdio.h
-simone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h
-simone.o: /usr/include/libio.h /usr/include/_G_config.h
-simone.o: /usr/include/bits/stdio_lim.h /usr/include/string.h
-simone.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-simone.o: /usr/include/bits/confname.h /usr/include/getopt.h
-simone.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
+simone.o: /usr/include/stdio.h /usr/include/sys/seek.h /usr/include/va_list.h
+simone.o: /usr/include/sys/limits.h /usr/include/sys/machine/machlimits.h
+simone.o: /usr/include/sys/syslimits.h /usr/include/sys/machine/machtime.h
+simone.o: /usr/include/sys/rt_limits.h /usr/include/string.h
+simone.o: /usr/include/strings.h /usr/include/unistd.h
+simone.o: /usr/include/sys/access.h /usr/include/fcntl.h
+simone.o: /usr/include/sys/fcntl.h /usr/include/sys/mode.h
Index: trunk/MagicSoft/Simulation/Corsika/Simone/simone.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Corsika/Simone/simone.cxx	(revision 417)
+++ trunk/MagicSoft/Simulation/Corsika/Simone/simone.cxx	(revision 418)
@@ -6,17 +6,4 @@
 //
 #include <stdlib.h>
-#include "TROOT.h"
-#include "TApplication.h"
-
-#include "TCanvas.h"
-#include "TView.h"
-
-#include "TSPHE.h"
-#include "TBRIK.h"
-
-#include "TNode.h"
-
-#include "TFile.h"
-#include "TNtuple.h"
 
 #include "COREventHeader.hxx"
@@ -24,17 +11,8 @@
 #include "CORStatfile.hxx"
 
-#include "MSimone.hxx"
-
 int main(int argc, char **argv)
 {
-  // initialise ROOT
+  char  path[100] = "" ; 
 
-  TROOT simple("simple", "SIMONE - statistic of MonteCarlo");
-
-  TApplication theApp("App", &argc, argv);
-  
-  char  path[100] = "/dat1/Mmcs/Gamm/" ; 
-  //    char  path[100] = "/hd02/Maggi/Data/prot_15/" ; 
-  //    char  path[100] = "/data/mmcs/" ; 
   char  cername[120] ; 
   char  datname[120] ; 
@@ -45,32 +23,27 @@
   CORParticle    Photon ; 
   
-  MSimone    Infos ; 
-    
   Int_t iPhotonInShower ; 
   
   Float_t lambda ; 
-  
+
+  cout << " ============================" << endl ; 
+  cout << " SIMONE" << endl ; 
+  cout << "                             " << endl ; 
   cout << " SImulated MONte carlo Events" << endl ; 
+  cout << "                             " << endl ; 
 
-  //
-  //    now create a root-file for the ntuple output
-  // 
-  
-  TFile *outfile = new TFile("simone.root","RECREATE");
-  
-  TNtuple *Ntup = new TNtuple("simone",
-			      "Simone info of mmcs",
-			      "fPartId:fEnergy:fTheta:fPhi:fCoreX:fCoreY:fCoreD:fNumCerPhot");
-  
-  
+
+  if ( argc <= 1 ) {
+    cout << endl ; 
+    cout << " INFO: You have to start the program with "<<endl <<endl ; 
+    cout << "        -> simone DIRECTORY_WITH_CER_FILES" <<endl <<endl ; 
+    cout << "        no SLASH at the end of the directory name"<<endl ; 
+    cout << "        (example: -> simone /hd123/Protons   "<<endl ; 
+    exit (-1) ; 
+  }
+
+  sprintf (path , "%s", argv[1] ) ; 
+    
   for (int i_cer = 1; i_cer <= 100; i_cer++ ) {
-    //
-    //   info of progress
-    //
-    if (!( i_cer %10) )
-      {
-	cout << i_cer << endl ; 
-      }
-
     //
     //   create the file names 
@@ -98,6 +71,7 @@
     
     Event.read( cerfile );
-    Infos.Transfer ( &Event ) ; 
-    
+  
+    Event.Print() ; 
+
     //
     //   loop over the particles (cerenkov photons) in 
@@ -126,15 +100,10 @@
       iPhotonInShower++ ; 
       
-      //Photon.print() ; 
+      Photon.print() ; 
     }
     
-    Infos.SetNumCerPhot( iPhotonInShower ) ; 
-    
     //
-    //   fill the ntuple
+    //   close the file
     //
-    
-    Infos.NtupFill ( Ntup ) ; 
-    
     
     cerfile.close();
@@ -144,22 +113,4 @@
   } 
   
-  
-  //
-  //   write all to file
-  //
-  outfile->Write() ; 
-
-  
-  //
-  //
-  //
-
-  Ntup->Draw("fEnergy") ; 
-
-
-  theApp.Run();
-  return 0;                            
-   
-  
 }