Changeset 10146

Timestamp:

02/09/11 11:06:52 (14 years ago)

Author:

rohlfs

Message:

replace the selection of the blockType from a string comparison to a switch - statement.

File:

• trunk/Mars/mcorsika/MCorsikaFormat.cc (modified) (2 diffs)

trunk/Mars/mcorsika/MCorsikaFormat.cc

@@ -114 +114 @@
                                     Int_t & blockLength) const
 {
-    char blockHeader[5];
-    blockHeader[4] = 0;
-    fIn->read(blockHeader, 4);
+    int blockHeader;
+    fIn->read((char*)&blockHeader, 4);
     if (fIn->eof())
         return kFALSE;
@@ -124 +123 @@
     blockLength     = 272 * 4;
 
-    if (strcmp(blockHeader, "RUNH") == 0)
-        blockType = 1200;
-    else if (strcmp(blockHeader, "RUNE") == 0)
-        blockType = 1210;
-    else if (strcmp(blockHeader, "EVTH") == 0)
-        blockType = 1202;
-    else if (strcmp(blockHeader, "EVTE") == 0)
-        blockType = 1209;
-    else    // the events, they don't have a specific header
-        {
-        blockType = 1105;
-        fIn->seekg(-4, ios::cur);
-        blockLength += 4;
-        }
-
+
+    switch(blockHeader)
+      {
+      case 1213093202 : // RUNH
+         blockType = 1200;
+         break;
+      case 1162761554 : // RUNE
+         blockType = 1210;
+         break;
+      case 1213486661 : // EVTH
+         blockType = 1202;
+         break;
+      case 1163155013 : // EVTE
+         blockType = 1209;
+         break;
+      default:          // the events, they don't have a specific header
+         blockType = 1105;
+         fIn->seekg(-4, ios::cur);
+         blockLength += 4;
+      }            
     return kTRUE;
 }