Changeset 1674 for trunk/MagicSoft/Simulation

Timestamp:

12/10/02 17:25:18 (22 years ago)

Author:

blanch

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Simulation/Detector

Files:

• Camera/camera.cxx (modified) (15 diffs)
• Camera/camera.h (modified) (4 diffs)
• include-MC/MCCphoton.hxx (modified) (2 diffs)
• include-MC/MCEventHeader_2.hxx (modified) (1 diff)
• include-MC/MCRunHeader.cxx (added)
• include-MC/MCRunHeader.hxx (added)

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.46 $
+// $Revision: 1.47 $
 // $Author: blanch $ 
-// $Date: 2002-11-08 17:51:00 $
+// $Date: 2002-12-10 17:19:31 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -408 +408 @@
 
   char flag[SIZE_OF_FLAGS + 1];  //@< flags in the .rfl file
+  char flag_new[4];              //@< New flag for the run header in the .rfl file
 
   int reflector_file_version;  //@< vrsion of he reflector file
@@ -1218 +1219 @@
     if(!isA( flag, FLAG_START_OF_RUN )){
 
-      //  We exit
-      //error( SIGNATURE, "Expected start of run flag, but found: %s\n", flag );
       //  We break the main loop
       cout<<"Warning: Expected start of run flag, but found:"<<flag<<endl;
@@ -1227 +1226 @@
     else { // found start of run
 
+      fread( flag_new, 4, 1, inputfile );
+
+      if(!isA( flag_new, FLAG_START_OF_HEADER)){
+
+        //  We break the main loop
+        cout<<"Warning: Expected start of run header flag, but found:"<<flag<<endl;
+        cout<<"         We break the main loop"<<endl;
+        break;      
+      }
+
+      Float_t flag_temp[SIZE_OF_MCRUNHEADER];
+      
+      fread( flag_temp, (SIZE_OF_MCRUNHEADER)*sizeof(float), 1, inputfile );
+
       nshow=0;
 
@@ -1232 +1245 @@
 
       while( isA( flag, FLAG_START_OF_EVENT   )){ // while there is a next event
+        fread( flag_new, 4, 1, inputfile );
+
+        if(!isA( flag_new, FLAG_EVENT_HEADER)){
+
+        //  We break while events loop
+          cout<<"Warning: Expected start of event header flag, but found:"<<flag<<endl;
+          cout<<"         We break the while events loop"<<endl;
+          break;      
+        }
+
         //
         // Clear Trigger and Fadc
@@ -1279 +1302 @@
         
         // read the direction of the incoming shower
-        
+
         if (reflector_file_version<6){
           thetashw = mcevth.get_theta();
@@ -1758 +1781 @@
             
             if (Write_McEvt){
-                }
+              Float_t ftime, ltime;
+              if (reflector_file_version<6){
+                mcevth.get_times(&ftime, &ltime);
+                McEvt->Fill( -1.0, 
+                             (UShort_t) mcevth.get_primary() , 
+                             mcevth.get_energy(),
+                             -1.0,
+                             -1.0,
+                             -1.0, 
+                             mcevth.get_theta(), 
+                             mcevth.get_phi(), 
+                             mcevth.get_core(),
+                             mcevth.get_coreX(),
+                             mcevth.get_coreY(),
+                             impactD,
+                             mcevth_2.get_theta_CT(),
+                             mcevth_2.get_phi_CT(),
+                             ftime,
+                             ltime,
+                             0,
+                             0,
+                             0,
+                             0,
+                             0,
+                             0,
+                             0,
+                             (UInt_t)mcevth.get_CORSIKA(), 
+                             (UInt_t)mcevth.get_AtmAbs(), 
+                             (UInt_t)mcevth.get_MirrAbs()+mcevth.get_OutOfMirr()+mcevth.get_BlackSpot(), 
+                             (UInt_t) ncph, 
+                             (UInt_t) inumphe,
+                             (UInt_t) inumphensb+inumphe);
+              }
+              else{
+                Float_t Nmax, t0, tmax, a, b, c, chi2;
+                mcevth.get_times(&ftime, &ltime);
+                chi2=mcevth_2.get_NKGfit(&Nmax, &t0, &tmax, &a, &b, &c);
+                McEvt->Fill( mcevth_2.get_evt_number(),
+                             (UShort_t) mcevth_2.get_primary() , 
+                             mcevth_2.get_energy(),
+                             mcevth_2.get_thick0(),
+                             mcevth_2.get_first_target(),
+                             mcevth_2.get_z_first_int(),
+                             mcevth_2.get_theta(), 
+                             mcevth_2.get_phi(), 
+                             mcevth_2.get_core(),
+                             mcevth_2.get_coreX(),
+                             mcevth_2.get_coreY(),
+                             impactD,
+                             mcevth_2.get_theta_CT(),
+                             mcevth_2.get_phi_CT(),
+                             ftime,
+                             ltime,
+                             Nmax,
+                             t0,
+                             tmax,
+                             a,
+                             b,
+                             c,
+                             chi2,
+                             (UInt_t)mcevth_2.get_CORSIKA(), 
+                             (UInt_t)mcevth_2.get_AtmAbs(), 
+                             (UInt_t)mcevth_2.get_MirrAbs()+mcevth_2.get_OutOfMirr()+mcevth_2.get_BlackSpot(), 
+                             (UInt_t) ncph, 
+                             (UInt_t) inumphe,
+                             (UInt_t) inumphensb+inumphe);
+              }
+            }
             //   We don not count photons out of the camera.    
             
@@ -1833 +1923 @@
       if( !isA( flag, FLAG_END_OF_RUN   )){
         error( SIGNATURE, "Expected end of run flag, but found: %s\n", flag );
+        break;
       }
       else { // found end of run
@@ -1843 +1934 @@
           log(SIGNATURE, "End of file . . .\n");
           still_in_loop  = FALSE;
-  
+          log(SIGNATURE, "Reading ASCII files at the end of the reflector file.  . .\n");
+          read_ascii(inputfile);
+          break;
           if ((! Data_From_STDIN) && ( !feof(inputfile) )){
             
@@ -1850 +1943 @@
 
             if((reflector_file_version=check_reflector_file( inputfile ))==FALSE){
-              exit(1);
+              // exit(1);
+              log(SIGNATURE, "Next file is not recognised as a reflector file.\n");
+              log(SIGNATURE, "Stopping ...\n");
+              break;
             }
             
@@ -1916 +2012 @@
                     mcevth.get_CWaveUpper(),
                     mcevth.get_slope(),
-                    mcevth.get_NumObsLev(),
+                    1,
                     heights,
                     corsika,
@@ -1922 +2018 @@
                     (UInt_t)(VERSION*100),
                     0);
-  
+
   //  Fill the Header Tree with the current leaves of each branch
   HeaderTree.Fill() ;
@@ -2725 +2821 @@
 //!@}
 
+//!-----------------------------------------------------------
+// @name read_ascii  
+//                          
+// @desc read ascii configuration files used by the reflector
+//
+// @date tue dec 10 17:14:10 CET 2002
+//------------------------------------------------------------
+// @function
+
+//!@{
+void 
+read_ascii(FILE *sp)
+{
+  cout<<"To be implemented..."<<endl;
+}
 
 //!-----------------------------------------------------------
@@ -3684 +3795 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.46  2002/11/08 17:51:00  blanch
+// *** empty log message ***
+//
 // Revision 1.45  2002/10/29 17:15:27  blanch
 // Reading several reflector versions.
@@ -3823 +3937 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.46  2002/11/08 17:51:00  blanch
+// *** empty log message ***
+//
 // Revision 1.45  2002/10/29 17:15:27  blanch
 // Reading several reflector versions.

trunk/MagicSoft/Simulation/Detector/Camera/camera.h

@@ -19 +19 @@
 //=
 //= $RCSfile: camera.h,v $
-//= $Revision: 1.12 $
+//= $Revision: 1.13 $
 //= $Author: blanch $ 
-//= $Date: 2002-10-29 17:16:28 $
+//= $Date: 2002-12-10 17:20:32 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -62 +62 @@
 #include "moments.h"
 
+#include "MCRunHeader.hxx"
 #include "MCEventHeader.hxx"
 #include "MCEventHeader_2.hxx"
@@ -281 +282 @@
 void read_QE(void);
 void read_WC(void);
+void read_ascii( FILE *sp // the input file
+                 );
 int pixels_are_neig(int pix1, int pix2);
 int bpoint_is_in_pix(double dx, double dy, int ipixnum, 
@@ -330 +333 @@
 /*
  *$Log: not supported by cvs2svn $
+ *Revision 1.12  2002/10/29 17:16:28  blanch
+ *Header file for camera.cxx version 1.45
+ *
  *Revision 1.11  2002/10/18 16:53:30  blanch
  *Modification to read several reflector version files.

trunk/MagicSoft/Simulation/Detector/include-MC/MCCphoton.hxx

@@ -43 +43 @@
 
 const char FLAG_START_OF_RUN[]   = "\nSTART---RUN\n";
+const char FLAG_START_OF_HEADER[]   = "RUNH";
 const char FLAG_START_OF_EVENT[] = "\nSTART-EVENT\n";
+const char FLAG_EVENT_HEADER[]   = "EVTH";
 const char FLAG_END_OF_EVENT[] =   "\nEND---EVENT\n";
 const char FLAG_END_OF_RUN[] =     "\nEND-----RUN\n";
@@ -50 +52 @@
 
 #define SIZE_OF_FLAGS  13
+#define SIZE_OF_HEADER    8       /* floats */
 #define SIZE_OF_MCCPHOTON    8   /* floats */
 

trunk/MagicSoft/Simulation/Detector/include-MC/MCEventHeader_2.hxx

@@ -39 +39 @@
 #include "COREventHeader.hxx"
 
-#define SIZE_OF_MCEVENTHEADER_2    178   /* floats */
+#define SIZE_OF_MCEVENTHEADER_2    181   /* floats */
 
 // @endcode