Print

Print


Commit in hps-java/src on MAIN
main/java/org/lcsim/hps/recon/tracking/HPSMakeSVTCellID.java+2-41.2 -> 1.3
test/java/org/lcsim/hps/recon/tracking/SVTDAQIO_Test.java+8-41.2 -> 1.3
+10-8
2 modified files

hps-java/src/main/java/org/lcsim/hps/recon/tracking
HPSMakeSVTCellID.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- HPSMakeSVTCellID.java	28 Mar 2012 18:43:11 -0000	1.2
+++ HPSMakeSVTCellID.java	28 Mar 2012 18:59:09 -0000	1.3
@@ -4,12 +4,10 @@
  */
 package org.lcsim.hps.recon.tracking;
 
-import org.lcsim.hps.recon.tracking.HPSSVTDAQMaps;
-import org.lcsim.geometry.Detector;
-import org.lcsim.hps.util.Pair;
+import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
-import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.hps.util.Pair;
 
 /**
  *

hps-java/src/test/java/org/lcsim/hps/recon/tracking
SVTDAQIO_Test.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SVTDAQIO_Test.java	28 Mar 2012 18:40:30 -0000	1.2
+++ SVTDAQIO_Test.java	28 Mar 2012 18:59:09 -0000	1.3
@@ -1,6 +1,5 @@
 package org.lcsim.hps.recon.tracking;
 
-import java.io.File;
 import java.io.IOException;
 
 import junit.framework.TestCase;
@@ -12,10 +11,15 @@
 import org.lcsim.hps.evio.MCRawDataToEvio4Converter2;
 import org.lcsim.job.JobControlManager;
 
+/**
+ * Run the test run recon and produce an EVIO output file.
+ * WARNING: Only works from SLAC NFS due to accessing local data file.
+ * @author Jeremy McCormick <[log in to unmask]>
+ */
 public class SVTDAQIO_Test extends TestCase {
 	
-	String lcsimXmlFile = "/u1/hps/trackerTest/HPSTestRunTracking.lcsim";
-	String slicFile = "/u1/hps/trackerTest/ap_75MeV_v4pt0";
+	String lcsimXmlResource = "/org/lcsim/hps/steering/HPSTestRunReconToEvio.lcsim";
+	String slicFile = "/nfs/slac/g/hps/omoreno/event_generation/ap_75MeV_v4pt0.slcio";
 	String evioFile = "TrackerTest.evio";
 	
 	public void testIt() throws Exception {
@@ -23,7 +27,7 @@
 		// Create EVIO file.
 		JobControlManager mgr = new JobControlManager();
 		mgr.addVariableDefinition("inputFile", slicFile);
-		mgr.setup(new File(lcsimXmlFile));
+		mgr.setup(lcsimXmlResource);
 		mgr.run();
 		
 		// Read back EVIO file.
CVSspam 0.2.12


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