LISTSERV 16.5 - LCD-CVS Archives

Commit in `lcsim/test/org/lcsim` on MAIN
`CombinedTrackerDigiTest.java`	+1	-1	1.5 -> 1.6
`HitMixingTest.java`	+1	-1	1.4 -> 1.5
`HitPositionTest.java`	+1	-1	1.3 -> 1.4
`SamplingFractionTest.java`	+1	-1	1.3 -> 1.4
`calorimeter/CalorimeterHitDetectorElementTest.java`	+1	-1	1.3 -> 1.4
`detector/tracker/readout/DetectorIdentifierHelperTest.java`	+2	-2	1.2 -> 1.3
`digisim/DigiSimCalorimeterHitIOTest.java`	+1	-1	1.3 -> 1.4
`/DigiSimTest.java`	+1	-1	1.10 -> 1.11
`recon/cluster/fixedcone/FixedConeClustererTest.java`	+1	-1	1.10 -> 1.11
`recon/tracking/seedtracker/SeedTrackerVSTest.java`	+1	-1	1.2 -> 1.3
`recon/vertexing/zvtop4/ZvTrackTest.java`	+1	-1	1.7 -> 1.8
`util/heprep/LCSimHepRepConverterTest.java`	+1	-1	1.7 -> 1.8
`util/lcio/RawTrackerHitIOTest.java`	+12	-2	1.3 -> 1.4
	+25	-15

13 modified files

change to sid01 test files instead of sid02

lcsim/test/org/lcsim

CombinedTrackerDigiTest.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- CombinedTrackerDigiTest.java	12 Mar 2009 23:44:43 -0000	1.5
+++ CombinedTrackerDigiTest.java	25 Mar 2009 01:01:15 -0000	1.6
@@ -17,7 +17,7 @@

 	public void test() throws Exception 
 	{			
 		FileCache cache = new FileCache();

-		File file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));

+		File file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio"));

 		LCSimLoop loop = new LCSimLoop();		
 		loop.setLCIORecordSource(file); 
 		loop.add(new DigiSeedTrackerDriver());

lcsim/test/org/lcsim

HitMixingTest.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- HitMixingTest.java	12 Mar 2009 23:44:43 -0000	1.4
+++ HitMixingTest.java	25 Mar 2009 01:01:15 -0000	1.5
@@ -29,7 +29,7 @@

     public void testMix() throws IOException, LoopException
     {
         FileCache cache = new FileCache();

-        File events = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));

+        File events = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio"));

         LCSimLoop loop = new LCSimLoop();
         loop.setLCIORecordSource(events);
         loop.add(new MixDriver());

lcsim/test/org/lcsim

HitPositionTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- HitPositionTest.java	12 Mar 2009 23:44:43 -0000	1.3
+++ HitPositionTest.java	25 Mar 2009 01:01:15 -0000	1.4
@@ -29,7 +29,7 @@

 
     public void testHitPosition() throws Exception
     {

-        runTestFile("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+        runTestFile("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

     }
 
     private void runTestFile(String s) throws Exception

lcsim/test/org/lcsim

SamplingFractionTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- SamplingFractionTest.java	12 Mar 2009 23:44:43 -0000	1.3
+++ SamplingFractionTest.java	25 Mar 2009 01:01:15 -0000	1.4
@@ -33,7 +33,7 @@

 
     public void testLCIORead() throws Exception
     {

-        URL url = new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+        URL url = new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

         FileCache cache = new FileCache();
         File file = cache.getCachedFile(url);

lcsim/test/org/lcsim/calorimeter

CalorimeterHitDetectorElementTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- CalorimeterHitDetectorElementTest.java	23 Mar 2009 18:56:01 -0000	1.3
+++ CalorimeterHitDetectorElementTest.java	25 Mar 2009 01:01:15 -0000	1.4
@@ -28,7 +28,7 @@

     public void testHits() throws Exception
     {
         URL url = new URL(

-                "http://www.lcsim.org/test/lcio/panpyWW-0-500_SLIC-v2r5p4_geant4-v9r2p0_LCPhys_sid02.slcio");

+                "http://www.lcsim.org/test/lcio/panpyWW-0-500_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

         FileCache cache = new FileCache();
         File testFile = cache.getCachedFile(url);
         LCSimLoop loop = new LCSimLoop();

lcsim/test/org/lcsim/detector/tracker/readout

DetectorIdentifierHelperTest.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- DetectorIdentifierHelperTest.java	12 Mar 2009 23:44:43 -0000	1.2
+++ DetectorIdentifierHelperTest.java	25 Mar 2009 01:01:15 -0000	1.3
@@ -26,7 +26,7 @@

  * on an sid01 LCIO file.
  *
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: DetectorIdentifierHelperTest.java,v 1.2 2009/03/12 23:44:43 jeremy Exp $

+ * @version $Id: DetectorIdentifierHelperTest.java,v 1.3 2009/03/25 01:01:15 jeremy Exp $

  */
 
 public class DetectorIdentifierHelperTest extends TestCase

@@ -37,7 +37,7 @@

 		try
 		{
 			FileCache cache = new FileCache();

-			file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));

+			file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio"));

 			LCSimLoop loop = new LCSimLoop();
 			loop.setLCIORecordSource(file);
 			loop.add(new TrackerDriver());

lcsim/test/org/lcsim/digisim

DigiSimCalorimeterHitIOTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- DigiSimCalorimeterHitIOTest.java	12 Mar 2009 23:44:43 -0000	1.3
+++ DigiSimCalorimeterHitIOTest.java	25 Mar 2009 01:01:15 -0000	1.4
@@ -29,7 +29,7 @@

 	public void testWrite() throws Exception
 	{	
 		FileCache cache = new FileCache();

-		File file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));

+		File file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio"));

 		LCSimLoop loop = new LCSimLoop();
 		loop.setLCIORecordSource(file);
 		loop.add(new SimToCalorimeterHitDriver());

lcsim/test/org/lcsim/digisim

DigiSimTest.java 1.10 -> 1.11

diff -u -r1.10 -r1.11
--- DigiSimTest.java	17 Mar 2009 22:01:39 -0000	1.10
+++ DigiSimTest.java	25 Mar 2009 01:01:15 -0000	1.11
@@ -31,7 +31,7 @@

    public void testDigiSim() throws Exception
    {
       // data file

-      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);

lcsim/test/org/lcsim/recon/cluster/fixedcone

FixedConeClustererTest.java 1.10 -> 1.11

diff -u -r1.10 -r1.11
--- FixedConeClustererTest.java	17 Mar 2009 22:01:39 -0000	1.10
+++ FixedConeClustererTest.java	25 Mar 2009 01:01:15 -0000	1.11
@@ -32,7 +32,7 @@

 
    public static void testNNClusterer() throws IOException, LoopException
    {

-      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

       
       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);

lcsim/test/org/lcsim/recon/tracking/seedtracker

SeedTrackerVSTest.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- SeedTrackerVSTest.java	12 Mar 2009 23:44:44 -0000	1.2
+++ SeedTrackerVSTest.java	25 Mar 2009 01:01:15 -0000	1.3
@@ -43,7 +43,7 @@

     
     public void testSeedTrackerVS() throws Exception 
     {

-        URL url = new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+        URL url = new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

         FileCache cache = new FileCache(); 
         File file = cache.getCachedFile(url); 
         LCSimLoop loop = new LCSimLoop();

lcsim/test/org/lcsim/recon/vertexing/zvtop4

ZvTrackTest.java 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- ZvTrackTest.java	17 Mar 2009 22:19:25 -0000	1.7
+++ ZvTrackTest.java	25 Mar 2009 01:01:15 -0000	1.8
@@ -26,7 +26,7 @@

         super.setUp();
         loop = new LCSimLoop();
         // contains psi- mu mu events

-        location = new URL("http://www.lcsim.org/test/lcio/psi_mumu_Theta4-176_5-100GeV_SLIC-v2r5p4_geant4-v9r2p0_LCPhys_sid02.slcio");

+        location = new URL("http://www.lcsim.org/test/lcio/psi_mumu_Theta4-176_5-100GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

         cache = new FileCache();
         primaryVertexFile = cache.getCachedFile(location);
         loop.setLCIORecordSource(primaryVertexFile);

lcsim/test/org/lcsim/util/heprep

LCSimHepRepConverterTest.java 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- LCSimHepRepConverterTest.java	17 Mar 2009 22:01:39 -0000	1.7
+++ LCSimHepRepConverterTest.java	25 Mar 2009 01:01:15 -0000	1.8
@@ -62,7 +62,7 @@

    public void testConvert() throws Exception
    {        
       LCSimConditionsManagerImplementation.register();

-      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio");

+      URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01.slcio");

       FileCache cache = new FileCache();
       File file = cache.getCachedFile(url);
       LCIOReader reader = new LCIOReader(file);

lcsim/test/org/lcsim/util/lcio

RawTrackerHitIOTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- RawTrackerHitIOTest.java	12 Mar 2009 23:44:44 -0000	1.3
+++ RawTrackerHitIOTest.java	25 Mar 2009 01:01:16 -0000	1.4
@@ -29,6 +29,7 @@

 	public void testRawTrackerHitIO() throws Exception
 	{
 		// Read in a file and write out some test RawTrackerHits.

+	    System.out.println("1");

 		FileCache cache = new FileCache();
 		File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01_planar_tracker.slcio"));
 		LCSimLoop loop = new LCSimLoop();

@@ -36,14 +37,18 @@

 		loop.add(new SimpleRawHitMaker());
 		File outputFile = new TestOutputFile("RawTrackerHitIOTest.slcio");
 		loop.add(new LCIODriver(outputFile));

-		loop.loop(-1,null);

+		System.out.println("2");
+		loop.loop(1,null);
+		System.out.println("3");

 		loop.dispose();

 		// Read back file from above.
 		loop = new LCSimLoop();
 		loop.setLCIORecordSource(outputFile);
 		loop.add(new RawTrackerHitCheck());

+		System.out.println("4");

 		loop.loop(1,null);

+		System.out.println("5");

 		loop.dispose();				
 	}

@@ -51,6 +56,8 @@

 	{
 		public void process(EventHeader event)
 		{

+		    System.out.println("SimpleRawHitMaker.process");
+

 			List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, "SiTrackerBarrel_RO");
 			List<RawTrackerHit> rawHits = new ArrayList<RawTrackerHit>();
 			for (SimTrackerHit simHit : simHits)

@@ -62,6 +69,7 @@

 			}
 			int flag = (1 << LCIOConstants.RTHBIT_HITS);
 			event.put("RawTrackerHits", rawHits, RawTrackerHit.class, flag, "SiTrackerBarrel_RO");

+			System.out.println("SimpleRawHitMaker.process - done");

 		}
 	}

@@ -69,6 +77,7 @@

 	{
 		public void process(EventHeader event)
 		{

+		    System.out.println("RawTrackerHitCheck.process");

 			List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "RawTrackerHits");
 			int simHitsRead = 0;
 			for (RawTrackerHit rawHit : rawHits)

@@ -87,6 +96,7 @@

 				throw new RuntimeException("Wrong number of SimTrackerHits!");
 			else
 				System.out.println("Read <" + rawHits.size() + "> RawTrackerHits -- okay!");

+			System.out.println("RawTrackerHitCheck.process - done");

 		}
 	}
 }

\ No newline at end of file

CVSspam 0.2.8