Changeset 18455 for branches/Corsika7500Compatibility/msim

Timestamp:

03/09/16 15:40:33 (9 years ago)

Author:

dbaack

Message:

Commit old changes from 7.4 Branch to this branch

Location:

branches/Corsika7500Compatibility/msim

Files:

• MPhotonData.h (modified) (1 diff)
• MPhotonEvent.cc (modified) (3 diffs)
• MPhotonEvent.h (modified) (1 diff)

branches/Corsika7500Compatibility/msim/MPhotonData.h

@@ -16 +16 @@
 #ifndef ROOT_TQuaternion
 #include <math.h>
-#define sqrt ::sqrt
+//#define sqrt ::sqrt
 #include <TQuaternion.h>
-#undef sqrt
+//#undef sqrt
 #endif
 

branches/Corsika7500Compatibility/msim/MPhotonEvent.cc

@@ -559 +559 @@
    fInFormat->Read(bunchHeader, 3 * sizeof(Int_t));
 
+   this->resize( bunchHeader[2] );   
+
    Int_t n = 0;
 
@@ -583 +585 @@
 {
    Int_t n = 0;
+
+   this->resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)
@@ -644 +648 @@
     }
 }
+
+void MPhotonEvent::Reset()
+{
+        this->Clear();
+        this->Resize(0);
+}

branches/Corsika7500Compatibility/msim/MPhotonEvent.h

@@ -70 +70 @@
     //void Clear(Option_t * = NULL);
 
+    void Reset();
+
     ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data
 };