Changeset 18235 for branches/Corsika7405Compatibility/msim

Timestamp:

06/18/15 15:22:04 (10 years ago)

Author:

dbaack

Message:

Fixed bug that creates empty or duplicated events for CSCAT=1 in Corsika

Location:

branches/Corsika7405Compatibility/msim

Files:

• MPhotonEvent.cc (modified) (3 diffs)
• MPhotonEvent.h (modified) (2 diffs)

branches/Corsika7405Compatibility/msim/MPhotonEvent.cc

@@ -513 +513 @@
 
 
-   //std::cout << "BunchHeader: " << bunchHeader[0] << " "
-        //         << bunchHeader[1] << " "
-        //         << bunchHeader[2] << std::endl;
+   /*std::cout << "BunchHeader: " << bunchHeader[0] << " "
+                   << bunchHeader[1] << " "
+                   << bunchHeader[2] << std::endl;*/
+
+   this->Resize(bunchHeader[2]);
 
    Int_t n = 0;
@@ -541 +543 @@
 {
    Int_t n = 0;
+
+   this->Resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)
@@ -602 +606 @@
     }
 }
+
+
+void MPhotonEvent::Reset()
+{
+        std::cout << "Reset!!"; this->Clear(); this->Resize(0);
+}

branches/Corsika7405Compatibility/msim/MPhotonEvent.h

@@ -11 +11 @@
 
 #include <iosfwd>
+#include <iostream>
 
 using namespace std;
@@ -68 +69 @@
     //void Clear(Option_t * = NULL);
 
+    void Reset();
+    //void Reset(){std::cout << "Reset!!"; this->Clear(); this->Resize(0); }
+
     ClassDef(MPhotonEvent, 1) //Container to store the raw Event Data
 };