Changeset 18526 for branches/Corsika7500Compatibility/msim/MPhotonEvent.cc

Timestamp:

06/28/16 14:29:15 (8 years ago)

Author:

dbaack

Message:

Bugfixes and gcc-5 compability changes

File:

• branches/Corsika7500Compatibility/msim/MPhotonEvent.cc (modified) (2 diffs)

branches/Corsika7500Compatibility/msim/MPhotonEvent.cc

@@ -559 +559 @@
    fInFormat->Read(bunchHeader, 3 * sizeof(Int_t));
 
-   this->resize( bunchHeader[2] );   
+   this->Resize( bunchHeader[2] );   
 
    Int_t n = 0;
@@ -582 +582 @@
 }
 
+Int_t MPhotonEvent::ReadEventIoEvtCompact(MCorsikaFormat *fInFormat)
+{
+        //Int_t bunchHeader[3];
+        //fInFormat->Read(bunchHeader, 3*sizeof(Int_t));
+        short array;
+        short tel;
+        float photon;
+        fInFormat->Read(&array, sizeof(array));
+        fInFormat->Read(&tel, sizeof(tel));
+        fInFormat->Read(&photon, sizeof(photon));
+
+        std::cout << "ReadEventIO Evt Compact  (Header) :  " << array << "  -  " << tel << "  -  " << photon << std::endl;
+
+        this->Resize( (int)photon );
+
+        int nbunches;
+        fInFormat->Read(&nbunches, sizeof(int));
+        std::cout << "ReadEventIO Evt Compact  (nbunches) :  " << nbunches << std::endl;
+
+        Int_t  n = 0;
+
+        for(int bunch = 0; bunch < (int)nbunches; bunch++)
+        {
+                short buffer[8];
+                float floatBuffer[8];
+                fInFormat->Read(buffer, 8 * sizeof(short));
+                
+
+                std::cout << "\nBunch: " << bunch << "  with: ";
+                for(int i=0; i<8; i++)
+                {
+                        std::cout << ",  " <<buffer[i];
+                        floatBuffer[i] = static_cast<float>(buffer[i]);
+                }
+
+                if(Add(n).FillEventIO(floatBuffer))
+                        n++;
+        }
+        Resize(n);
+        fData.UnSort();
+        
+        SetReadyToSave();
+
+        return kTRUE;
+}
+
 Int_t MPhotonEvent::ReadCorsikaEvt(Float_t * data, Int_t numEvents, Int_t arrayIdx)
 {
    Int_t n = 0;
 
-   this->resize(numEvents);
+   this->Resize(numEvents);
 
    for (Int_t event = 0; event < numEvents; event++)