Print

Print


Commit in lcio/src/java/hep/lcio on MAIN
example/AnalysisJob.java+3-31.7 -> 1.8
implementation/sio/IndexBlock.java+61.2 -> 1.3
+9-3
2 modified files
bug fix with unsorted indices for direct access - to be reviewed 

lcio/src/java/hep/lcio/example
AnalysisJob.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- AnalysisJob.java	7 Dec 2010 14:23:10 -0000	1.7
+++ AnalysisJob.java	10 Dec 2010 10:52:19 -0000	1.8
@@ -26,7 +26,8 @@
       LCReader lcReader = LCFactory.getInstance().createLCReader();
       lcReader.open(args);
 
-   /**fg: ... test code for direct access to run header .... 
+  /**
+      //fg: ... test code for direct access to run header .... 
       for(int i=9 ; i > -1 ; --i)
       {
          LCRunHeader runHdr = lcReader.readRunHeader(i);
@@ -34,7 +35,7 @@
             break;
          System.out.println("  Run : " + runHdr.getRunNumber() + " - " + runHdr.getDetectorName() + ":  " + runHdr.getDescription());
       }
-    */
+   */
       for (;;)
       {
          LCRunHeader runHdr = lcReader.readNextRunHeader();
@@ -42,7 +43,6 @@
             break;
          System.out.println("  Run : " + runHdr.getRunNumber() + " - " + runHdr.getDetectorName() + ":  " + runHdr.getDescription());
       }
-
       // close and reopen the file
       lcReader.close();
       lcReader.open(args);

lcio/src/java/hep/lcio/implementation/sio
IndexBlock.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- IndexBlock.java	22 Jun 2010 13:49:55 -0000	1.2
+++ IndexBlock.java	10 Dec 2010 10:52:19 -0000	1.3
@@ -142,6 +142,12 @@
             long location = firstLocation + (longOffset ? sio.readLong() : sio.readInt());
             index.add(new IndexEntry(run, event, location));
         }
+        //fg: this needs to be sorted as later a binary search is used
+        //    in getLocation(RunEvent re)
+        //  - in case this is not wanted, than a linear search would have
+        //    to be used there 
+        Collections.sort( index ) ;
+        
         sio.close();
     }
 
CVSspam 0.2.8