17 modified files
lcsim-contrib
diff -u -r1.36 -r1.36.4.1
--- pom.xml 15 Feb 2012 18:17:25 -0000 1.36
+++ pom.xml 1 Mar 2012 00:14:44 -0000 1.36.4.1
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.lcsim</groupId>
<artifactId>lcsim</artifactId>
- <version>1.22-SNAPSHOT</version>
+ <version>1.23-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- DriverLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ DriverLoop.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -12,12 +12,10 @@
package org.lcsim.contrib.Cassell;
import java.io.File;
-import org.lcsim.mc.fast.MCFast;
+import org.freehep.record.source.NoSuchRecordException;
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,7 +47,7 @@
File input = new File(filename);
loop.setLCIORecordSource(input);
long eventsCountedFromThisFile = 0;
- long eventsProcessedAtStartOfThisFile = loop.getTotalCountableSupplied();
+ long eventsProcessedAtStartOfThisFile = loop.getTotalCountableConsumed();
while (numToProcess>0)
{
try
@@ -58,9 +56,9 @@
eventsCountedFromThisFile += eventsProcessedThisIteration;
numToProcess -= eventsProcessedThisIteration;
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException 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 +70,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.");
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- MCFastReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ MCFastReconLoop.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -15,11 +15,10 @@
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.*;
+import org.freehep.record.source.NoSuchRecordException;
/**
*
@@ -99,9 +98,9 @@
{
nevts = loop.loop(-1);
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException x)
{
- nevts = loop.getTotalCountableSupplied();
+ nevts = loop.getTotalCountableConsumed();
}
loop.dispose();
System.out.println("Processed "+nevts+"events from file "+inname);
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- PPRReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ PPRReconLoop.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -15,11 +15,10 @@
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.*;
+import org.freehep.record.source.NoSuchRecordException;
/**
*
@@ -99,9 +98,9 @@
{
nevts = loop.loop(-1);
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException x)
{
- nevts = loop.getTotalCountableSupplied();
+ nevts = loop.getTotalCountableConsumed();
}
loop.dispose();
System.out.println("Processed "+nevts+"events from file "+inname);
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- SteveReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ SteveReconLoop.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -15,11 +15,10 @@
*/
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.*;
+import org.freehep.record.source.NoSuchRecordException;
public class SteveReconLoop {
public SteveReconLoop()
@@ -92,9 +91,9 @@
{
nevts = loop.loop(-1);
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException x)
{
- nevts = loop.getTotalCountableSupplied();
+ nevts = loop.getTotalCountableConsumed();
}
loop.dispose();
System.out.println("Processed "+nevts+"events from file "+inname);
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- UIReconLoop.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ UIReconLoop.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -15,11 +15,10 @@
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.*;
+import org.freehep.record.source.NoSuchRecordException;
/**
*
@@ -99,9 +98,9 @@
{
nevts = loop.loop(-1);
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException x)
{
- nevts = loop.getTotalCountableSupplied();
+ nevts = loop.getTotalCountableConsumed();
}
loop.dispose();
System.out.println("Processed "+nevts+"events from file "+inname);
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- UIReconLoopTrack.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ UIReconLoopTrack.java 1 Mar 2012 00:14:44 -0000 1.1.1.1.4.1
@@ -15,11 +15,10 @@
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.*;
+import org.freehep.record.source.NoSuchRecordException;
/**
*
@@ -98,9 +97,9 @@
{
nevts = loop.loop(-1);
}
- catch (LoopSourceExhaustedException x)
+ catch (NoSuchRecordException x)
{
- nevts = loop.getTotalCountableSupplied();
+ nevts = loop.getTotalCountableConsumed();
}
loop.dispose();
System.out.println("Processed "+nevts+"events from file "+inname);
lcsim-contrib/src/main/java/org/lcsim/contrib/Grefe/overlayEvents
diff -u -r1.1 -r1.1.4.1
--- OverlayEvents.java 11 Jan 2010 11:14:57 -0000 1.1
+++ OverlayEvents.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -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());
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/ex
diff -u -r1.1 -r1.1.4.1
--- StandAloneDriver.java 23 Jun 2009 22:15:40 -0000 1.1
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -5,11 +5,9 @@
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.freehep.record.source.NoSuchRecordException;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCSimLoop;
@@ -19,7 +17,7 @@
*/
public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException, NoSuchRecordException
{
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(new File("/Users/matthiasbussonnier/SLAC/testStereo-muons-150events.slcio"));
lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/StandAloneDriver
diff -u -r1.6 -r1.6.4.1
--- StandAloneDriver.java 28 Feb 2011 20:04:02 -0000 1.6
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.6.4.1
@@ -7,7 +7,7 @@
import java.io.File;
import java.io.IOException;
-import org.freehep.record.loop.LoopException;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.recon.tracking.seedtracker.trackingdrivers.sidloi3.MainTrackingDriver;
//import org.lcsim.contrib.sATLAS.Utopia7Final.sATLASMainDriver;
import org.lcsim.util.Driver;
@@ -19,7 +19,7 @@
*/
public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException, NoSuchRecordException
{
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(new File("c:\\sid\\sidloi3\\w33005_01-5-100_SLIC-v2r8p3_geant4-v9r3p1_QGSP_BERT_sidloi3.slcio"));
lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASDigi
diff -u -r1.1 -r1.1.4.1
--- ExampleDriver.java 20 Feb 2009 22:43:51 -0000 1.1
+++ ExampleDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -1,11 +1,11 @@
-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.freehep.record.source.NoSuchRecordException;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.util.Driver;
@@ -39,7 +39,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, NoSuchRecordException {
LCSimLoop loop = new LCSimLoop();
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/DarkPhoton
diff -u -r1.1 -r1.1.4.1
--- StandAloneDriver.java 4 Jan 2010 18:51:14 -0000 1.1
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -7,7 +7,7 @@
import java.io.File;
import java.io.IOException;
-import org.freehep.record.loop.LoopException;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCSimLoop;
@@ -17,7 +17,7 @@
*/
public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException {
+ public static void main(String[] args) throws IOException, NoSuchRecordException {
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"));
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi
diff -u -r1.1 -r1.1.4.1
--- StandAloneDriver.java 21 Apr 2009 23:54:40 -0000 1.1
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -7,8 +7,7 @@
import java.io.File;
import java.io.IOException;
-import org.freehep.record.loop.LoopException;
-import org.lcsim.contrib.Partridge.Atlas.AtlasU01TrackingDriver;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCSimLoop;
@@ -18,7 +17,7 @@
*/
public class StandAloneDriver extends Driver {
- public static void main(String[] args) throws IOException, LoopException
+ public static void main(String[] args) throws IOException, NoSuchRecordException
{
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(new File("/nfs/sulky21/g.ec.u12/users/mgraham/AtlasUpgrade/testStereo-muons-150events.slcio"));
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/cat
diff -u -r1.2 -r1.2.4.1
--- CatDriver.java 10 Jul 2009 19:25:02 -0000 1.2
+++ CatDriver.java 1 Mar 2012 00:14:45 -0000 1.2.4.1
@@ -3,30 +3,21 @@
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.freehep.record.source.NoSuchRecordException;
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 +39,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.2.4.1 2012/03/01 00:14:45 onoprien Exp $
*/
public class CatDriver extends Driver {
@@ -380,7 +371,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, NoSuchRecordException {
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
lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7Barrel
diff -u -r1.1 -r1.1.4.1
--- StandAloneDriver.java 4 Jan 2010 18:51:13 -0000 1.1
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -6,7 +6,7 @@
import java.io.File;
import java.io.IOException;
-import org.freehep.record.loop.LoopException;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCSimLoop;
@@ -16,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, NoSuchRecordException {
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"));
lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7
diff -u -r1.1 -r1.1.4.1
--- StandAloneDriver.java 20 Aug 2009 05:06:59 -0000 1.1
+++ StandAloneDriver.java 1 Mar 2012 00:14:45 -0000 1.1.4.1
@@ -6,7 +6,7 @@
import java.io.File;
import java.io.IOException;
-import org.freehep.record.loop.LoopException;
+import org.freehep.record.source.NoSuchRecordException;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCSimLoop;
@@ -16,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, NoSuchRecordException {
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"));
lcsim-contrib/src/main/java/org/lcsim/contrib/uiowa
diff -u -r1.2 -r1.2.4.1
--- MainLoop.java 27 May 2011 12:01:07 -0000 1.2
+++ MainLoop.java 1 Mar 2012 00:14:45 -0000 1.2.4.1
@@ -3,12 +3,10 @@
package org.lcsim.contrib.uiowa;
import java.io.File;
-import org.lcsim.mc.fast.MCFast;
+import org.freehep.record.source.NoSuchRecordException;
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,19 @@
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);
eventsCountedFromThisFile += eventsProcessedThisIteration;
- eventsProcessed = loop.getTotalCountableSupplied();
- } catch (LoopSourceExhaustedException x) {
- long eventsProcessedAtEndOfThisFile = loop.getTotalCountableSupplied();
+ eventsProcessed = loop.getTotalCountableConsumed();
+ } catch (NoSuchRecordException x) {
+ long eventsProcessedAtEndOfThisFile = loop.getTotalCountableConsumed();
System.out.println("File "+filename+" exhausted after "+eventsProcessedAtEndOfThisFile+" records total. ["+x+"]");
// Adjust for events processed this loop
- eventsProcessed = loop.getTotalCountableSupplied();
+ eventsProcessed = loop.getTotalCountableConsumed();
break;
}
}
CVSspam 0.2.12