Changeset 19331


Ignore:
Timestamp:
Oct 30, 2018, 3:36:44 PM (8 months ago)
Author:
tbretz
Message:
Cleaned... made all the block-length variable so that it can be different between raw and thinned data.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mcorsika/MCorsikaFormat.cc

    r19329 r19331  
    5555    }
    5656
    57     uint32_t magic = 0;
     57    uint32_t magic = 0,
    5858    fileIn->read((char*)&magic, 4);
    5959
     
    131131    }
    132132
    133     blockVersion = 0;
     133    blockVersion    = 0;
    134134    blockIdentifier = 0;
    135135    blockLength     = fBlockLength/21 - 4;
    136 
    137 //    cout << "P=" << fIn->tellg() << " L=" <<blockLength << " " << hex << blockHeader << dec << " " << fIn->eof() << endl;
    138136
    139137    switch(blockHeader)
     
    173171Bool_t MCorsikaFormatRaw::SeekEvtEnd()
    174172{
    175     const uint32_t step   = fBlockLength/21;
    176     const uint32_t offset = fBlockLength?4:0;
    177 
    178 //    cout << fIn->bad() << " " << fIn->eof() << " " << fIn->tellg() << endl;
     173    const uint32_t step   =  fBlockLength/21;
     174    const uint32_t offset = (fBlockLength?4:0);
    179175
    180176    // Search subblockwise backward (Block: 5733*4 = 21*273*4)
    181177    for (uint32_t i=1; i<22; i++)
    182178    {
    183         const int32_t L = i*step + offset;
     179        const uint32_t L = i*step + offset;
    184180        fIn->seekg(-L, ios::end);
    185181
    186182        uint32_t magic = 0;
    187183        fIn->read((char*)&magic, 4);
    188 
    189 //        cout << dec << L << " " << fIn->tellg() << " " << hex << magic << endl;
    190184
    191185        if (magic==kRUNE)
Note: See TracChangeset for help on using the changeset viewer.