Print

Print


Commit in hps-java on MAIN
pom.xml+2-11.27 -> 1.28
src/main/java/org/lcsim/hps/recon/tracking/MapDAQCellID_Backup.java+73added 1.1
src/test/java/org/lcsim/MapDAQCellID.java-731.1 removed
+75-74
1 added + 1 removed + 1 modified, total 3 files
move class from test area; exclude broken tests from build

hps-java
pom.xml 1.27 -> 1.28
diff -u -r1.27 -r1.28
--- pom.xml	28 Mar 2012 17:14:54 -0000	1.27
+++ pom.xml	28 Mar 2012 18:55:56 -0000	1.28
@@ -72,7 +72,8 @@
 					<excludes>
                         <!-- Fix for http://jira.codehaus.org/browse/SUREFIRE-288 -->
 						<exclude>**/*$*</exclude>
-                        <exclude>org/lcsim/DoEvioTest.java</exclude>
+						<exclude>org/lcsim/hps/recon/tracking/SVTDAQIO_Test.java</exclude>
+                        <exclude>org/lcsim/hps/evio/DoEvioTest.java</exclude>
                         <exclude>org/lcsim/hps/et/BasicET12SystemTest.java</exclude>
                         <exclude>org/lcsim/hps/evio/RawTrackerHitToEvio4Converter_Test.java</exclude>
                         <exclude>org/lcsim/hps/evio/MCRawDataToEvio4Converter2.java</exclude>

hps-java/src/main/java/org/lcsim/hps/recon/tracking
MapDAQCellID_Backup.java added at 1.1
diff -N MapDAQCellID_Backup.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MapDAQCellID_Backup.java	28 Mar 2012 18:55:56 -0000	1.1
@@ -0,0 +1,73 @@
+/*
+ * Class for obtaining the LCSimCellID for a given DAQCellID
+ * 
+ * created: 2/18/2012
+ */
+package org.lcsim.hps.recon.tracking;
+
+/**
+ * 
+ * @author homer
+ */
+import java.util.HashMap;
+import java.util.Map;
+import java.io.File;
+import java.io.FileReader;
+import java.nio.channels.FileChannel;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+
+public class MapDAQCellID_Backup {
+
+//    List<cellmap> SVTCellMap = new ArrayList<cellmap>();
+//    List<cellmap> ECALCellMap = new ArrayList<cellmap>();
+    HashMap<Integer, Integer> SVTCellMap = new HashMap<Integer, Integer>();
+
+    public void addSVTCellToMap(Integer DAQCellID_, Integer LCSimCellID_) {
+        SVTCellMap.put(DAQCellID_, LCSimCellID_);
+    }
+
+    public void fillSVTCellMap() {
+        String fileName = "SVTDAQLCSimMap.dat";
+        File fileIn = new File(fileName);
+
+        try {
+            System.out.println(
+                    "MapDAQCellID::reading SVT DAQtoLCSIM Cell Map from" + fileName + " size: " + fileIn.length());
+//        FileInputStream fileInputStream = new FileInputStream(fileIn);
+//        FileChannel inputChannel = fileInputStream.getChannel();
+            FileReader fr = new FileReader(fileIn);
+            StreamTokenizer tok = new StreamTokenizer(fr);
+            tok.resetSyntax();
+            tok.wordChars(33, 255);
+            tok.parseNumbers();
+            tok.whitespaceChars(0, ' ');
+            tok.eolIsSignificant(true);
+            //        long sz = inputChannel.size();
+
+            while (tok.nextToken() != tok.TT_EOF) {
+//            System.out.println(nums.toString());
+
+                Integer DAQCellID_ = Integer.valueOf(tok.sval);
+                tok.nextToken();
+                Integer LCSimCellID_ = Integer.valueOf(tok.sval);
+                tok.nextToken(); // this should be the end of the line
+                if (tok.ttype == tok.TT_EOL) {
+                    throw new RuntimeException("Unexpected entry for number of cellIDs");
+                }
+
+//            String line = fr.readLine();
+                SVTCellMap.put(DAQCellID_, LCSimCellID_);
+            }
+        } catch (IOException e) {
+            System.out.println(e);
+        }
+
+    }
+
+    public Integer SVTCellIDlookup(Long DAQCellID_) {
+        return (SVTCellMap.get(DAQCellID_));
+    }
+//            System.out.println("this LCSimCellID(=" + LCSimCellID_ + ") was found for DAQCellID(=" + DAQCellID_ + ")");
+}

hps-java/src/test/java/org/lcsim
MapDAQCellID.java removed after 1.1
diff -N MapDAQCellID.java
--- MapDAQCellID.java	18 Feb 2012 22:51:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
-/*
- * Class for obtaining the LCSimCellID for a given DAQCellID
- * 
- * created: 2/18/2012
- */
-package org.lcsim;
-
-/**
- * 
- * @author homer
- */
-import java.util.HashMap;
-import java.util.Map;
-import java.io.File;
-import java.io.FileReader;
-import java.nio.channels.FileChannel;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.StreamTokenizer;
-
-public class MapDAQCellID {
-
-//    List<cellmap> SVTCellMap = new ArrayList<cellmap>();
-//    List<cellmap> ECALCellMap = new ArrayList<cellmap>();
-    HashMap<Integer, Integer> SVTCellMap = new HashMap<Integer, Integer>();
-
-    public void addSVTCellToMap(Integer DAQCellID_, Integer LCSimCellID_) {
-        SVTCellMap.put(DAQCellID_, LCSimCellID_);
-    }
-
-    public void fillSVTCellMap() {
-        String fileName = "SVTDAQLCSimMap.dat";
-        File fileIn = new File(fileName);
-
-        try {
-            System.out.println(
-                    "MapDAQCellID::reading SVT DAQtoLCSIM Cell Map from" + fileName + " size: " + fileIn.length());
-//        FileInputStream fileInputStream = new FileInputStream(fileIn);
-//        FileChannel inputChannel = fileInputStream.getChannel();
-            FileReader fr = new FileReader(fileIn);
-            StreamTokenizer tok = new StreamTokenizer(fr);
-            tok.resetSyntax();
-            tok.wordChars(33, 255);
-            tok.parseNumbers();
-            tok.whitespaceChars(0, ' ');
-            tok.eolIsSignificant(true);
-            //        long sz = inputChannel.size();
-
-            while (tok.nextToken() != tok.TT_EOF) {
-//            System.out.println(nums.toString());
-
-                Integer DAQCellID_ = Integer.valueOf(tok.sval);
-                tok.nextToken();
-                Integer LCSimCellID_ = Integer.valueOf(tok.sval);
-                tok.nextToken(); // this should be the end of the line
-                if (tok.ttype == tok.TT_EOL) {
-                    throw new RuntimeException("Unexpected entry for number of cellIDs");
-                }
-
-//            String line = fr.readLine();
-                SVTCellMap.put(DAQCellID_, LCSimCellID_);
-            }
-        } catch (IOException e) {
-            System.out.println(e);
-        }
-
-    }
-
-    public Integer SVTCellIDlookup(Long DAQCellID_) {
-        return (SVTCellMap.get(DAQCellID_));
-    }
-//            System.out.println("this LCSimCellID(=" + LCSimCellID_ + ") was found for DAQCellID(=" + DAQCellID_ + ")");
-}
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