Changeset 723 for trunk/MagicSoft/Simulation

Timestamp:

04/06/01 17:48:09 (24 years ago)

Author:

magicsol

Message:

New camera version able to read the new format of the reflector output:
reflector 0.4

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (11 diffs)

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

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.23 $
-// $Author: blanch $ 
-// $Date: 2001-03-28 16:13:41 $
+// $Revision: 1.24 $
+// $Author: magicsol $ 
+// $Date: 2001-04-06 16:48:09 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -385 +385 @@
   //@'
 
+  int ioscar=0;
+
   char inname[256];           //@< input file name
   char starfieldname[256];    //@< starfield input file name
@@ -1128 +1130 @@
 
       while( isA( flag, FLAG_START_OF_EVENT   )){ // while there is a next event
-
         //
         // Clear Trigger and Fadc
@@ -1141 +1142 @@
         
         // get MCEventHeader
-        
         fread( (char*)&mcevth, mcevth.mysize(), 1, inputfile );
 
@@ -1443 +1443 @@
                            mcevth.get_coreY(),
                            impactD,
-                           ulli, 
-                           ulli, 
-                           (UInt_t) ncph, 
+                           (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,
@@ -1452 +1452 @@
             //  Fill the Tree with the current leaves of each branch
             i=EvtTree.Fill() ;
-    
+
             //  Clear the branches
             if(Write_McTrig){
@@ -1559 +1559 @@
                            mcevth.get_coreY(),
                            impactD,
-                           ulli, 
-                           ulli, 
-                           (UInt_t) ncph, 
+                           (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,
@@ -1574 +1574 @@
             
             EvtTree.Fill() ; 
-            
-          
-          
+                          
             //
             //    if a first level trigger occurred, then 
@@ -2854 +2852 @@
           
     // check if wl is inside table; outside the table, QE is assumed to be zero
-
     
     if((wl < qept[0][0]) || (wl > qept[0][pointsQE-1])){
@@ -3220 +3217 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.23  2001/03/28 16:13:41  blanch
+// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
+// been solved.
+//
 // Revision 1.22  2001/03/20 18:52:43  blanch
 // *** empty log message ***
@@ -3268 +3269 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.23  2001/03/28 16:13:41  blanch
+// While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
+// been solved.
+//
 // Revision 1.22  2001/03/20 18:52:43  blanch
 // *** empty log message ***