Changeset 9949 for trunk/Mars/msim

Timestamp:

09/29/10 21:30:21 (14 years ago)

Author:

tbretz

Message:

Fixed a problem reading the RUNE section in the raw corsika files and accelerated plain readcorsika.

File:

• trunk/Mars/msim/MPhotonEvent.cc (modified) (3 diffs)

trunk/Mars/msim/MPhotonEvent.cc

@@ -398 +398 @@
 Int_t MPhotonEvent::GetNumExternal() const
 {
-    Int_t n=0;
-
-    for (int i=0; i<GetNumPhotons(); i++)
+    const Int_t n=GetNumPhotons();
+
+    Int_t rc = 0;
+    for (int i=0; i<n; i++)
         if ((*this)[i].GetPrimary()!=MMcEvtBasic::kNightSky)
-            n++;
-
-    return n;
+            rc++;
+
+    return rc;
 }
 
@@ -816 +817 @@
 }
 */
+
 // --------------------------------------------------------------------------
 //
@@ -822 +824 @@
 void MPhotonEvent::Print(Option_t *) const
 {
-    fData.Print();
+    // This is much faster than looping over all entries and discarding
+    // the empty ones
+    const UInt_t n = GetNumPhotons();
+    for (UInt_t i=0; i<n; i++)
+        operator[](i).Print();
 }