Changeset 18235 for branches

Timestamp:

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

Author:

dbaack

Message:

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

Location:

branches/Corsika7405Compatibility

Files:

• mcorsika/MCorsikaEvtHeader.cc (modified) (1 diff)
• mcorsika/MCorsikaRead.cc (modified) (9 diffs)
• msim/MPhotonEvent.cc (modified) (3 diffs)
• msim/MPhotonEvent.h (modified) (2 diffs)
• msimcamera/MSimAPD.cc (modified) (1 diff)

branches/Corsika7405Compatibility/mcorsika/MCorsikaEvtHeader.cc

@@ -153 +153 @@
     // f[96] // Number of reuse of event [max=20]
     fTotReuse = TMath::Nint(f[96]);
+
+    std::cout << "            Total Reuse:" << fTotReuse << std::endl;
+
     if (fTotReuse > 20)
       {

branches/Corsika7405Compatibility/mcorsika/MCorsikaRead.cc

@@ -406 +406 @@
       return kTRUE;
 
-   if (fBlockType == 1204 && fReadState != 2)
+   if (fBlockType == 1204 && (fReadState != 2 && fReadState != 15) )
       // next is a new set of telescope arrays, we store the previous ones
       // but not if this is the first one (fReadState != 2)
@@ -478 +478 @@
 Int_t MCorsikaRead::Process()
 {
-        fEvent->Clear();
-        fEvent->Reset();
+        //fEvent->Clear();
+
+        //fEvent->Resize(0);
+
+
+        std::cout << "\n\n MCorsikaRead Process " << std::endl;
         fEvent->Resize(0);
-
-
-        std::cout << "\n\n MCorsikaRead Process " << std::endl;
    while (1)  // loop for multiple input files
    {
@@ -530 +531 @@
                status = fEvtHeader->ReadEvt(buffer);
 
+               std::cout << "----------ArrayIndex:: " << fArrayIdx << std::endl;
 
                if (fArrayIdx >= (Int_t)fEvtHeader->GetTotReuse())
@@ -550 +552 @@
                else
                   // skip this array of telescopes
+                   {
                   fInFormat->Seek(fBlockLength);
                    std::cout << "Skip Array!" << std::endl;
+                   }
                break;
 
@@ -558 +562 @@
                {
                Int_t telIdx   = fBlockIdentifier % 1000;
+
+               std::cout << "----------TelescopeIndex:: " << fTelescopeIdx << std::endl;
 
                if (fBlockVersion == 0  && (fTelescopeIdx < 0 || fTelescopeIdx ==  telIdx) )
@@ -575 +581 @@
 
 
-                  bool tmpWeight = false;
+                  /*bool tmpWeight = false;
                   std::cout << "ReadEventIO Telescope data with " << fEvent->GetNumPhotons() << std::endl;
                   for(int i=0; i<fEvent->GetNumPhotons(); i++)
@@ -585 +591 @@
                   }
                   if(tmpWeight)
-                          std::cout << "CorsikaRead Photon weight != 1" << std::endl;
+                          std::cout << "CorsikaRead Photon weight != 1" << std::endl;*/
 
                   }
@@ -629 +635 @@
             case 1105:  // event block of raw format
                 static int NmrEventBlock = 0;
-                //std::cout << "EventBlock ||||||" << ++NmrEventBlock << std::endl;
+                std::cout << "EventBlock ||||||" << ++NmrEventBlock << std::endl;
                if (fReadState == 2 || fReadState == 10)
                   {
@@ -677 +683 @@
             return status;
 
+
          Int_t headerStatus =  ReadNextBlockHeader();
+
+         std::cout << "fBlockType: " << fBlockType << "  fReadState: " << fReadState
+                         << " HeaderStatus: " << headerStatus << std::endl;
+
 
          if (headerStatus == kFALSE) 

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
 };

branches/Corsika7405Compatibility/msimcamera/MSimAPD.cc

@@ -307 +307 @@
             *fLog << err << "ERROR - MSimAPD: Weight of " << i << "-th photon not 1, but " << ph.GetWeight() << endl;
             ph.Print();
-            //return kERROR;
+            return kERROR;
         }