Changeset 5078 for trunk/MagicSoft/Simulation/Detector

Timestamp:

09/16/04 16:54:27 (20 years ago)

Author:

moralejo

Message:

Updated in CVS after some time...

Location:

trunk/MagicSoft/Simulation/Detector/include-MC

Files:

• MCCphoton.hxx (modified) (5 diffs)
• MCEventHeader.hxx (modified) (1 diff)
• MCEventHeader_2.hxx (modified) (1 diff)
• MCRunHeader.hxx (modified) (1 diff)

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

@@ -58 +58 @@
 
 class MCCphoton {
-
-public:
+private:
   Float_t     w;                // wavelength [nm/-] +
                                 //   1000*(id_generator)
@@ -83 +82 @@
   }
 
+  Int_t read ( FILE *f ) {
+    return fread( &w, mysize(), 1, f );
+  }
+
+  void get_flag(Char_t* c)
+  {
+    memcpy(c, (Char_t*)&w, SIZE_OF_FLAGS);
+  }
+
   // writes photon to binary output stream
   Int_t write ( ofstream &os ) {
@@ -91 +99 @@
   // get information about the photon
   inline Float_t get_wl( void ) { return ( w - 1000.*((int)floor(w/1000.))); }
+
   inline Int_t get_particle( void ) { 
     return ( (int)floor(w/1000.) );
   }
+
 
   inline Float_t get_x( void ) { return ( x ); }
@@ -102 +112 @@
   inline Float_t get_t( void ) { return ( t ); }
   inline Float_t get_phi( void ) { return ( phi ); }
-                  
+
+
   inline Float_t get_r( void ) { return ( sqrt( x*x + y*y ) ); }
   inline Float_t get_w( void ) { return ( sqrt( 1.0 - u*u - v*v ) ); }
@@ -121 +132 @@
   }
 
+
+  inline void fill(Char_t* data) 
+  {
+    cout << "hola1" << endl;
+    memcpy((Char_t*)(&w), data, mysize());
+    cout << "hola2" << endl;
+  }
+
+
   int isA( const char * flag ) {
     return ( (strncmp((char *)this, flag, 8)==0) ? TRUE : FALSE );
   }
 
-  inline int mysize(void) { return ( SIZE_OF_MCCPHOTON*sizeof(float) ); }
+  inline int mysize(void) { return ( SIZE_OF_MCCPHOTON*sizeof(Float_t) ); }
 
 };

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

@@ -104 +104 @@
   }
 
+  Int_t read (FILE* f) {
+    return fread((char*)&EvtNumber, (SIZE_OF_MCEVENTHEADER)*sizeof(Float_t), 1, f );
+  }
+  
+
   // writes EventHeader to binary output stream
   Int_t write ( ofstream &os ) {

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

@@ -180 +180 @@
   }
 
+  Int_t read (FILE* f) {
+    return fread((char*)&EvtNumber, (SIZE_OF_MCEVENTHEADER_2)*sizeof(Float_t), 1, f );
+  }
+
   // writes EventHeader to binary output stream
   Int_t write ( ofstream &os ) {

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

@@ -132 +132 @@
   }
 
+  Int_t read (FILE* f) {
+    return fread((char*)&RunNumber, (SIZE_OF_MCRUNHEADER)*sizeof(float), 1, f );
+  }
+  
+
   // writes EventHeader to binary output stream
   Int_t write ( ofstream &os ) {