Commit in lcsim-contrib on MAIN | |||
pom.xml | +2 | -2 | 1.41 -> 1.42 |
src/main/java/org/lcsim/contrib/Cassell/DriverLoop.java | +6 | -7 | 1.1.1.1 -> 1.2 |
/MCFastReconLoop.java | +2 | -10 | 1.1.1.1 -> 1.2 |
/PPRReconLoop.java | +2 | -10 | 1.1.1.1 -> 1.2 |
/SteveReconLoop.java | +1 | -9 | 1.1.1.1 -> 1.2 |
/UIReconLoop.java | +1 | -9 | 1.1.1.1 -> 1.2 |
/UIReconLoopTrack.java | +1 | -9 | 1.1.1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/Grefe/overlayEvents/OverlayEvents.java | +2 | -2 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/Mbussonn/ex/StandAloneDriver.java | +1 | -4 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/Partridge/StandAloneDriver/StandAloneDriver.java | +1 | -2 | 1.6 -> 1.7 |
src/main/java/org/lcsim/contrib/Partridge/sATLASDigi/ExampleDriver.java | +2 | -3 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/mgraham/DarkPhoton/StandAloneDriver.java | +1 | -2 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/mgraham/sATLASDigi/StandAloneDriver.java | +1 | -3 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/onoprien/crux/cat/CatDriver.java | +2 | -13 | 1.2 -> 1.3 |
src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7Barrel/StandAloneDriver.java | +1 | -2 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7/StandAloneDriver.java | +1 | -2 | 1.1 -> 1.2 |
src/main/java/org/lcsim/contrib/uiowa/MainLoop.java | +8 | -9 | 1.2 -> 1.3 |
+35 | -98 |
merge from recordloop-dev
diff -u -r1.41 -r1.42 --- pom.xml 9 May 2012 21:30:23 -0000 1.41 +++ pom.xml 15 Jun 2012 05:26:25 -0000 1.42 @@ -3,7 +3,7 @@
<artifactId>lcsim-contrib</artifactId> <groupId>org.lcsim</groupId> <name>LCSim Contrib Packages</name>
- <version>1.6-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<description>User contributions and examples for the org.lcsim project.</description> <scm> <connection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim-contrib</connection>
@@ -115,7 +115,7 @@
<dependency> <groupId>org.lcsim</groupId> <artifactId>lcsim</artifactId>
- <version>1.23</version>
+ <version>2.0-SNAPSHOT</version>
</dependency> </dependencies> </project>
diff -u -r1.1.1.1 -r1.2 --- DriverLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ DriverLoop.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -11,13 +11,11 @@
package org.lcsim.contrib.Cassell;
+import java.io.EOFException;
import java.io.File;
-import org.lcsim.mc.fast.MCFast;
import org.lcsim.util.Driver; import org.lcsim.util.aida.AIDA;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
public class DriverLoop {
@@ -49,18 +47,19 @@
File input = new File(filename); loop.setLCIORecordSource(input); long eventsCountedFromThisFile = 0;
- long eventsProcessedAtStartOfThisFile = loop.getTotalCountableSupplied();
+ long eventsProcessedAtStartOfThisFile = loop.getTotalCountableConsumed();
while (numToProcess>0) { try { long eventsProcessedThisIteration = loop.loop(numToProcess);
+ if (numToProcess != -1L && numToProcess != eventsProcessedThisIteration) throw new EOFException();
eventsCountedFromThisFile += eventsProcessedThisIteration; numToProcess -= eventsProcessedThisIteration; }
- catch (LoopSourceExhaustedException x)
+ catch (EOFException x)
{
- long eventsProcessedAtEndOfThisFile = loop.getTotalCountableSupplied();
+ long eventsProcessedAtEndOfThisFile = loop.getTotalCountableConsumed();
System.out.println("File "+filename+" exhausted after "+eventsProcessedAtEndOfThisFile+" records total. ["+x+"]"); // Adjust for events processed this loop long extraProcessed = (eventsProcessedAtEndOfThisFile-eventsProcessedAtStartOfThisFile) - eventsCountedFromThisFile;
@@ -72,7 +71,7 @@
} }
- eventsProcessed = loop.getTotalCountableSupplied();
+ eventsProcessed = loop.getTotalCountableConsumed();
long eventsProcessedFromThisFile = eventsProcessed - eventsProcessedAtStartOfThisFile; System.out.println("Processed "+eventsProcessedFromThisFile+" events from file "+filename+",: Total is "+eventsProcessed+", with "+numToProcess+" to go.");
diff -u -r1.1.1.1 -r1.2 --- MCFastReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ MCFastReconLoop.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -15,9 +15,7 @@
package org.lcsim.contrib.Cassell; import java.io.File; import org.lcsim.util.Driver;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
import org.lcsim.contrib.Cassell.recon.Cheat.OutputMCFastRecon; import java.util.*;
@@ -95,14 +93,8 @@
Driver myDriver = new OutputMCFastRecon(output); loop.add(myDriver); long nevts = 0;
- try - { - nevts = loop.loop(-1); - } - catch (LoopSourceExhaustedException x) - { - nevts = loop.getTotalCountableSupplied(); - }
+ nevts = loop.loop(-1); + nevts = loop.getTotalCountableConsumed();
loop.dispose(); System.out.println("Processed "+nevts+"events from file "+inname); }
diff -u -r1.1.1.1 -r1.2 --- PPRReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ PPRReconLoop.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -15,9 +15,7 @@
package org.lcsim.contrib.Cassell; import java.io.File; import org.lcsim.util.Driver;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
import org.lcsim.contrib.Cassell.recon.Cheat.OutputPPRRecon; import java.util.*;
@@ -95,14 +93,8 @@
Driver myDriver = new OutputPPRRecon(output); loop.add(myDriver); long nevts = 0;
- try - { - nevts = loop.loop(-1); - } - catch (LoopSourceExhaustedException x) - { - nevts = loop.getTotalCountableSupplied(); - }
+ nevts = loop.loop(-1); + nevts = loop.getTotalCountableConsumed();
loop.dispose(); System.out.println("Processed "+nevts+"events from file "+inname); }
diff -u -r1.1.1.1 -r1.2 --- SteveReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ SteveReconLoop.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -15,9 +15,7 @@
*/ import java.io.File; import org.lcsim.util.Driver;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
import org.lcsim.contrib.Cassell.recon.Steve.OutputSteveRecon; import java.util.*; public class SteveReconLoop {
@@ -88,14 +86,8 @@
Driver myDriver = new OutputSteveRecon(output); loop.add(myDriver); long nevts = 0;
- try - {
nevts = loop.loop(-1);
- } - catch (LoopSourceExhaustedException x) - { - nevts = loop.getTotalCountableSupplied(); - }
+ nevts = loop.getTotalCountableConsumed();
loop.dispose(); System.out.println("Processed "+nevts+"events from file "+inname); }
diff -u -r1.1.1.1 -r1.2 --- UIReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ UIReconLoop.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -15,9 +15,7 @@
package org.lcsim.contrib.Cassell; import java.io.File; import org.lcsim.util.Driver;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
import org.lcsim.contrib.Cassell.recon.UI.OutputUIRecon; import java.util.*;
@@ -95,14 +93,8 @@
Driver myDriver = new OutputUIRecon(output); loop.add(myDriver); long nevts = 0;
- try - {
nevts = loop.loop(-1);
- } - catch (LoopSourceExhaustedException x) - { - nevts = loop.getTotalCountableSupplied(); - }
+ nevts = loop.getTotalCountableConsumed();
loop.dispose(); System.out.println("Processed "+nevts+"events from file "+inname); }
diff -u -r1.1.1.1 -r1.2 --- UIReconLoopTrack.java 10 Dec 2008 22:03:06 -0000 1.1.1.1 +++ UIReconLoopTrack.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -15,9 +15,7 @@
package org.lcsim.contrib.Cassell; import java.io.File; import org.lcsim.util.Driver;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
import org.lcsim.contrib.Cassell.recon.UI.OutputUIReconTrack; import java.util.*;
@@ -94,14 +92,8 @@
Driver myDriver = new OutputUIReconTrack(output); loop.add(myDriver); long nevts = 0;
- try - {
nevts = loop.loop(-1);
- } - catch (LoopSourceExhaustedException x) - { - nevts = loop.getTotalCountableSupplied(); - }
+ nevts = loop.getTotalCountableConsumed();
loop.dispose(); System.out.println("Processed "+nevts+"events from file "+inname); }
diff -u -r1.1 -r1.2 --- OverlayEvents.java 11 Jan 2010 11:14:57 -0000 1.1 +++ OverlayEvents.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -9,7 +9,7 @@
import java.util.Map; import java.util.Random;
-import org.freehep.record.source.EndOfSourceException;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.event.EventHeader; import org.lcsim.event.GenericObject; import org.lcsim.event.MCParticle;
@@ -266,7 +266,7 @@
try { lcio.next(); event = (EventHeader) lcio.getCurrentRecord();
- } catch (EndOfSourceException e) {
+ } catch (NoSuchRecordException e) {
rewind = true; } catch (Exception e) { System.err.println(e.getMessage());
diff -u -r1.1 -r1.2 --- StandAloneDriver.java 23 Jun 2009 22:15:40 -0000 1.1 +++ StandAloneDriver.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -5,11 +5,8 @@
package org.lcsim.contrib.Mbussonn.ex;
-import org.lcsim.contrib.Mbussonn.*;
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException; -import org.lcsim.contrib.Partridge.Atlas.AtlasU01TrackingDriver;
import org.lcsim.util.Driver; import org.lcsim.util.loop.LCSimLoop;
@@ -19,7 +16,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException
{ LCSimLoop loop = new LCSimLoop(); loop.setLCIORecordSource(new File("/Users/matthiasbussonnier/SLAC/testStereo-muons-150events.slcio"));
diff -u -r1.6 -r1.7 --- StandAloneDriver.java 28 Feb 2011 20:04:02 -0000 1.6 +++ StandAloneDriver.java 15 Jun 2012 05:26:25 -0000 1.7 @@ -7,7 +7,6 @@
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException;
import org.lcsim.recon.tracking.seedtracker.trackingdrivers.sidloi3.MainTrackingDriver; //import org.lcsim.contrib.sATLAS.Utopia7Final.sATLASMainDriver; import org.lcsim.util.Driver;
@@ -19,7 +18,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException
{ LCSimLoop loop = new LCSimLoop(); loop.setLCIORecordSource(new File("c:\\sid\\sidloi3\\w33005_01-5-100_SLIC-v2r8p3_geant4-v9r3p1_QGSP_BERT_sidloi3.slcio"));
diff -u -r1.1 -r1.2 --- ExampleDriver.java 20 Feb 2009 22:43:51 -0000 1.1 +++ ExampleDriver.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -1,11 +1,10 @@
-package org.lcsim.contrib.mgraham.sATLASDigi;
+package org.lcsim.contrib.Partridge.sATLASDigi;
import hep.physics.vec.VecOp; import java.io.File; import java.io.IOException; import java.net.URL; import java.util.List;
-import org.freehep.record.loop.LoopException;
import org.lcsim.event.EventHeader; import org.lcsim.event.MCParticle; import org.lcsim.util.Driver;
@@ -39,7 +38,7 @@
/** * A main routine which allows this to run outside of JAS */
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException {
LCSimLoop loop = new LCSimLoop();
diff -u -r1.1 -r1.2 --- StandAloneDriver.java 4 Jan 2010 18:51:14 -0000 1.1 +++ StandAloneDriver.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -7,7 +7,6 @@
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException;
import org.lcsim.util.Driver; import org.lcsim.util.loop.LCSimLoop;
@@ -17,7 +16,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException {
LCSimLoop loop = new LCSimLoop(); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/testStereo-muons-150events.slcio")); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/mbussonn/out/outdir-With-010-Muons-025-cat/sATLAS-With-10-Muons-025-IntPerEvent-160-EventPerFile-2.slcio"));
diff -u -r1.1 -r1.2 --- StandAloneDriver.java 21 Apr 2009 23:54:40 -0000 1.1 +++ StandAloneDriver.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -7,8 +7,6 @@
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException; -import org.lcsim.contrib.Partridge.Atlas.AtlasU01TrackingDriver;
import org.lcsim.util.Driver; import org.lcsim.util.loop.LCSimLoop;
@@ -18,7 +16,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException
{ LCSimLoop loop = new LCSimLoop(); loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/testStereo-muons-150events.slcio"));
diff -u -r1.2 -r1.3 --- CatDriver.java 10 Jul 2009 19:25:02 -0000 1.2 +++ CatDriver.java 15 Jun 2012 05:26:25 -0000 1.3 @@ -3,30 +3,19 @@
import java.io.File; import java.io.IOException; import java.util.*;
-import java.util.logging.Level; - -import hep.physics.vec.Hep3Vector; -import org.freehep.record.loop.LoopException;
import org.lcsim.event.EventHeader; import org.lcsim.event.MCParticle;
-import org.lcsim.event.Track; -import org.lcsim.event.SimTrackerHit;
import org.lcsim.fit.helicaltrack.StereoHitMaker;
-import org.lcsim.geometry.IDDecoder;
import org.lcsim.recon.tracking.seedtracker.SeedStrategy; import org.lcsim.recon.tracking.seedtracker.SeedTracker; import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
-import org.lcsim.util.loop.FileList; -import org.lcsim.util.loop.LCIOEventSource;
import org.lcsim.util.loop.LCSimLoop;
-import org.lcsim.contrib.onoprien.data.CalHitMap;
import org.lcsim.contrib.onoprien.data.ITrackSeed; import org.lcsim.contrib.onoprien.data.heprep.ClusterNodeHeprepConverter; import org.lcsim.contrib.onoprien.data.heprep.ITrackSeedHeprepConverter; import org.lcsim.contrib.onoprien.data.heprep.RosaryHeprepConverter; import org.lcsim.contrib.onoprien.data.legacy.ITrackerHitToHelicalTrackHitConverter;
-import org.lcsim.contrib.onoprien.data.legacy.OldTrackerHitRemover;
import org.lcsim.contrib.onoprien.data.legacy.TrackToITrackConverter; import org.lcsim.contrib.onoprien.data.mctruth.RecType; import org.lcsim.contrib.onoprien.geom.calorimeter.lib.SiD02Geometry;
@@ -48,7 +37,7 @@
* An example top level driver for Calorimeter Assisted Tracking (stub, unfinished). * * @author D. Onoprienko
- * @version $Id: CatDriver.java,v 1.2 2009/07/10 19:25:02 onoprien Exp $
+ * @version $Id: CatDriver.java,v 1.3 2012/06/15 05:26:25 onoprien Exp $
*/ public class CatDriver extends Driver {
@@ -380,7 +369,7 @@
/** * Main function for running this driver standalone. */
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException {
LCSimLoop loop = new LCSimLoop(); loop.setLCIORecordSource(new File("D:/Physics/Linear Collider/Data/sid02/SingleParticle/K0S_pipi_Theta45-135_5-25Gev_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio")); // Or to read a stdhep file
diff -u -r1.1 -r1.2 --- StandAloneDriver.java 4 Jan 2010 18:51:13 -0000 1.1 +++ StandAloneDriver.java 15 Jun 2012 05:26:25 -0000 1.2 @@ -6,7 +6,6 @@
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException;
import org.lcsim.util.Driver; import org.lcsim.util.loop.LCSimLoop;
@@ -16,7 +15,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException {
LCSimLoop loop = new LCSimLoop(); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/testStereo-muons-150events.slcio")); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/mbussonn/out/outdir-With-010-Muons-025-cat/sATLAS-With-10-Muons-025-IntPerEvent-160-EventPerFile-2.slcio"));
diff -u -r1.1 -r1.2 --- StandAloneDriver.java 20 Aug 2009 05:06:59 -0000 1.1 +++ StandAloneDriver.java 15 Jun 2012 05:26:26 -0000 1.2 @@ -6,7 +6,6 @@
import java.io.File; import java.io.IOException;
-import org.freehep.record.loop.LoopException;
import org.lcsim.util.Driver; import org.lcsim.util.loop.LCSimLoop;
@@ -16,7 +15,7 @@
*/ public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException {
LCSimLoop loop = new LCSimLoop(); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/testStereo-muons-150events.slcio")); // loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/mbussonn/out/outdir-With-010-Muons-025-cat/sATLAS-With-10-Muons-025-IntPerEvent-160-EventPerFile-2.slcio"));
diff -u -r1.2 -r1.3 --- MainLoop.java 27 May 2011 12:01:07 -0000 1.2 +++ MainLoop.java 15 Jun 2012 05:26:26 -0000 1.3 @@ -2,13 +2,11 @@
package org.lcsim.contrib.uiowa;
+import java.io.EOFException;
import java.io.File;
-import org.lcsim.mc.fast.MCFast;
import org.lcsim.util.Driver; import org.lcsim.util.aida.AIDA;
-import org.lcsim.util.loop.LCIODriver;
import org.lcsim.util.loop.LCSimLoop;
-import org.freehep.record.loop.LoopSourceExhaustedException;
public class MainLoop {
@@ -36,19 +34,20 @@
File input = new File(filename); loop.setLCIORecordSource(input); long eventsCountedFromThisFile = 0;
- long eventsProcessedAtStartOfThisFile = loop.getTotalCountableSupplied();
+ long eventsProcessedAtStartOfThisFile = loop.getTotalCountableConsumed();
while (eventsProcessed < numToProcess) { long eventsStillNeeded = numToProcess - eventsProcessed; try { if(i==3){ loop.skip(numToSkip); } else { loop.skip(0); } long eventsProcessedThisIteration = loop.loop(eventsStillNeeded);
+ if (eventsProcessedThisIteration != eventsStillNeeded) throw new EOFException();
eventsCountedFromThisFile += eventsProcessedThisIteration;
- eventsProcessed = loop.getTotalCountableSupplied(); - } catch (LoopSourceExhaustedException x) { - long eventsProcessedAtEndOfThisFile = loop.getTotalCountableSupplied(); - System.out.println("File "+filename+" exhausted after "+eventsProcessedAtEndOfThisFile+" records total. ["+x+"]");
+ eventsProcessed = loop.getTotalCountableConsumed(); + } catch (EOFException x) { + long eventsProcessedAtEndOfThisFile = loop.getTotalCountableConsumed(); + System.out.println("File "+filename+" exhausted after "+eventsProcessedAtEndOfThisFile+" records total. ["+loop.getProgress().getException()+"]");
// Adjust for events processed this loop
- eventsProcessed = loop.getTotalCountableSupplied();
+ eventsProcessed = loop.getTotalCountableConsumed();
break; } }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1