Print

Print


Commit in hps-java on MAIN
sandbox/MapDAQCellID.java+92added 1.1
       /MapDAQCellID_Backup.java+73added 1.1
src/main/java/org/lcsim/hps/recon/tracking/MapDAQCellID.java-921.2 removed
                                          /MapDAQCellID_Backup.java-731.1 removed
+165-165
2 added + 2 removed, total 4 files
move unused classes to sandbox

hps-java/sandbox
MapDAQCellID.java added at 1.1
diff -N MapDAQCellID.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MapDAQCellID.java	29 Apr 2012 23:03:22 -0000	1.1
@@ -0,0 +1,92 @@
+/*
+ * 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;
+
+import org.lcsim.geometry.Detector;
+import org.lcsim.util.Driver;
+
+
+public class MapDAQCellID extends Driver {
+
+//    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_ + ")");
+
+    /**
+     * 
+     * @param detector 
+     */
+    @Override
+    public void detectorChanged(Detector detector) {
+        // Call the sub-Driver's detectorChanged methods.
+        super.detectorChanged(detector);
+        
+        // Map sensors to 
+        fillSVTCellMap();
+    
+    }
+    
+}
\ No newline at end of file

hps-java/sandbox
MapDAQCellID_Backup.java added at 1.1
diff -N MapDAQCellID_Backup.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ MapDAQCellID_Backup.java	29 Apr 2012 23:03:22 -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/main/java/org/lcsim/hps/recon/tracking
MapDAQCellID.java removed after 1.2
diff -N MapDAQCellID.java
--- MapDAQCellID.java	28 Mar 2012 16:13:17 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,92 +0,0 @@
-/*
- * 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;
-
-import org.lcsim.geometry.Detector;
-import org.lcsim.util.Driver;
-
-
-public class MapDAQCellID extends Driver {
-
-//    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_ + ")");
-
-    /**
-     * 
-     * @param detector 
-     */
-    @Override
-    public void detectorChanged(Detector detector) {
-        // Call the sub-Driver's detectorChanged methods.
-        super.detectorChanged(detector);
-        
-        // Map sensors to 
-        fillSVTCellMap();
-    
-    }
-    
-}
\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/recon/tracking
MapDAQCellID_Backup.java removed after 1.1
diff -N MapDAQCellID_Backup.java
--- MapDAQCellID_Backup.java	28 Mar 2012 18:55:56 -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.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_ + ")");
-}
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