Changeset 10165 for trunk/Mars/mcorsika

Timestamp:

02/21/11 08:24:37 (14 years ago)

Author:

rohlfs

Message:

removed some old code and some debug printouts

Location:

trunk/Mars/mcorsika

Files:

• MCorsikaRead.cc (modified) (2 diffs)
• MCorsikaRead.h (modified) (1 diff)

trunk/Mars/mcorsika/MCorsikaRead.cc

@@ -390 +390 @@
       return kFALSE;
 
-    gLog << "Next fBlock:  type=" << fBlockType << " version=" << fBlockVersion;
-    gLog << " identifier=" << fBlockIdentifier << " length=" << fBlockLength; 
-    gLog << " readState= " << fReadState << endl;
+//    gLog << "Next fBlock:  type=" << fBlockType << " version=" << fBlockVersion;
+//    gLog << " identifier=" << fBlockIdentifier << " length=" << fBlockLength; 
+//    gLog << " readState= " << fReadState << endl;
    
    if (fReadState == 3 && fBlockType != 1210)
@@ -665 +665 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// The Process reads one event from the binary file:
-//  - The event header is read
-//  - the run header is read
-//  - all crate information is read
-//  - the raw data information of one event is read
-//
-Int_t MCorsikaRead::Process_Old()
-{
-
-   if (fReadState == 11)
-      {
-      // we are currently saving the events of the raw format in the root file
-      if (fEvtHeader->GetNumReuse() == fRunHeader->GetNumReuse())
-         {
-         // all data are saved
-         fRawEvemtBuffer.resize(0);
-         fReadState = 3;
-         }
-      else
-         {
-         fEvtHeader->InitXY();
-         Int_t rc = fEvent->ReadCorsikaEvt(&fRawEvemtBuffer[0], 
-                                           fRawEvemtBuffer.size() / 7, 
-                                           fEvtHeader->GetNumReuse()+1);
-         fEvtHeader->IncNumReuse();
-         return rc;
-         }
-      }
-
-   while (1)
-   {
-      if (fInFormat)
-      {
-
-         while (fInFormat->NextBlock(fReadState == 4, fBlockType, fBlockVersion, 
-                                     fBlockIdentifier, fBlockLength))
-         {
-            gLog << "Next fBlock:  type=" << fBlockType << " version=" << fBlockVersion;
-            gLog << " identifier=" << fBlockIdentifier << " length=" << fBlockLength << endl;
-
-
-            if (fReadState == 4)
-               {
-               fTopBlockLength -= fBlockLength + 12;
-               if (fTopBlockLength <= 0)
-                  // all data of a top block are read, go back to normal state
-                  fReadState = 3;
-               }
-
-            Int_t status = kTRUE;
-            switch (fBlockType)
-               {
-               case 1200:       // the run header
-                  status = fRunHeader->ReadEvt(fInFormat);
-                  fReadState = 1;  // RUNH is read
-                  break;
-
-               case 1201:       // telescope position
-                  status = ReadTelescopePosition();
-sleep(5);
-                  break;
-
-               case 1202:  // the event header
-                  Float_t buffer[272];
-                  if (!fInFormat->Read(buffer, 272 * sizeof(Float_t))) 
-                     return kFALSE;
-
-                  if (fReadState == 1)  // first event after RUN header
-                     {
-                     fRunHeader->ReadEventHeader(buffer);
-                     fRunHeader->Print();
-                     }
-
-                  status = fEvtHeader->ReadEvt(buffer);
-                  if (fArrayIdx >= (Int_t)fEvtHeader->GetTotReuse())
-                     {
-                     *fLog << err << "ERROR - Requested array index " << fArrayIdx << 
-                           " exceeds number of arrays " << fEvtHeader->GetTotReuse() << 
-                           " in file." << endl;
-                     return kERROR;
-                     }
-
-
-                  fReadState = 2;
-                  break;
-
-               case 1204:
-                  if (fArrayIdx < 0 || fArrayIdx == fBlockIdentifier)
-                     { 
-                     fReadState = 4;
-                     fTopBlockLength = fBlockLength;
-                     }
-                  else
-                     // skip this array of telescopes
-                     fInFormat->Seek(fBlockLength);
-
-                  break;
-               
-               case 1205:
-                  {
-                  Int_t telIdx   = fBlockIdentifier % 1000;
-                  if (fBlockVersion == 0                               &&
-                      (fTelescopeIdx < 0 || fTelescopeIdx ==  telIdx)     )
-                     {
-                     status = fEvent->ReadEventIoEvt(fInFormat);
-
-                     Int_t arrayIdx = fBlockIdentifier / 1000;
-                     Float_t xArrOff, yArrOff;
-                     fEvtHeader->GetArrayOffset(arrayIdx, xArrOff, yArrOff);
-                     fEvtHeader->SetTelescopeOffset(arrayIdx, 
-                                                    xArrOff + fTelescopeY[telIdx], 
-                                                    yArrOff - fTelescopeX[telIdx] );
-                     fEvent->AddXY(xArrOff + fTelescopeY[telIdx], 
-                                   yArrOff - fTelescopeX[telIdx]);
-                     fEvent->SimWavelength(fRunHeader->GetWavelengthMin(), 
-                                           fRunHeader->GetWavelengthMax());
-
-                     if (status == kTRUE)
-                        // end of reading for one telescope in one array == 
-                        // end of this Process - step
-                        return status;
-                     }
-                  else
-                     // skip this telescope
-                     fInFormat->Seek(fBlockLength);
-                  }
-                  break;
-
-               case 1209:  // the event end
-                  status = fEvtHeader->ReadEvtEnd(fInFormat);
-                  if (fReadState == 10 || fReadState == 2)
-                     {
-                     // all particles of this event are read, now save them
-                     fReadState = 11;
-                     fEvtHeader->ResetNumReuse();
-
-                     fEvtHeader->InitXY();
-                     Int_t rc = fEvent->ReadCorsikaEvt(&fRawEvemtBuffer[0], 
-                                                       fRawEvemtBuffer.size() / 7, 
-                                                       fEvtHeader->GetNumReuse()+1);
-                     fEvtHeader->IncNumReuse();
-                     return rc;
-                     }
-                  else
-                     fReadState = 3;  // event closed, run still open
-                  break;
-
-               case 1210:  // the run end
-                  status = fRunHeader->ReadEvtEnd(fInFormat, kTRUE);
-                  fNumEvents += fRunHeader->GetNumEvents();
-                  fRunHeader->SetReadyToSave();
-                  fReadState = 5;           // back to  starting point
-                  return status;
-                  break;
-
-               case 1105:  // event block of raw format
-                  if (fReadState == 2 || fReadState == 10)
-                     {
-                     Int_t oldSize = fRawEvemtBuffer.size();
-                     fRawEvemtBuffer.resize(oldSize + fBlockLength / sizeof(Float_t));
-                     status = fInFormat->Read(&fRawEvemtBuffer[oldSize], fBlockLength); 
-                     fReadState = 10;
-                     }
-                  else
-                     fInFormat->Seek(fBlockLength);
-                  break;
-
-               default:
-                  // unknown block, we skip it
-                  fInFormat->Seek(fBlockLength);
-
-               }
-
-            if (status != kTRUE)
-                return status;
-            
-         }
-
-      }
-
-      //
-      // If an event could not be read from file try to open new file
-      //
-      const Int_t rc = OpenNextFile();
-      if (rc!=kTRUE)
-          return rc;
-   }
-   return kTRUE;
-}
 
 // --------------------------------------------------------------------------

trunk/Mars/mcorsika/MCorsikaRead.h

@@ -76 +76 @@
     Int_t PreProcess(MParList *pList);
     Int_t Process();
-    Int_t Process_Old();
     Int_t PostProcess();