hps-java/src/main/java/org/lcsim/hps/evio

diff -u -r1.1 -r1.2
--- MCRawDataToEvio4Converter.java	21 Mar 2012 20:19:13 -0000	1.1
+++ MCRawDataToEvio4Converter.java	22 Mar 2012 02:21:16 -0000	1.2
@@ -1,6 +1,7 @@

 package org.lcsim.hps.evio;
 
 import java.io.IOException;

+import java.util.ArrayList;

 import java.util.List;
 
 import org.jlab.coda.jevio.CompositeData;

@@ -10,8 +11,10 @@

 import org.jlab.coda.jevio.EvioBank;
 import org.jlab.coda.jevio.EvioException;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.RawTrackerHit;

+import org.lcsim.geometry.IDDecoder;

 import org.lcsim.util.Driver;
 
 /**

@@ -40,14 +43,19 @@

     
     String rawTrackerHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
     String rawCalorimeterHitCollectionName = "EcalRawHits";    

-            
-    public static final int trackerBankTag = 0x0;
-    public static final int trackerBankNumber = 1;

+
+    // These correspond to ROC (readout crate) IDs from the DAQ system.
+    public static final int ecalTopBankTag = 0x1;
+    public static final int ecalBottomBankTag = 0x2;
+    public static final int trackerBankTag = 0x3;
+        
+    // CompositeData formats.

     public static final String trackerFormat = "N(L,I,I)";

+    public static final String ecalFormat = "N(L,I,I)";

-    public static final int ecalBankTag = 0xe103;

+    //public static final int ecalBankTag = 0xe103;
+    public static final int trackerBankNumber = 1;

     public static final int ecalBankNumber = 2;

-    public static final String ecalFormat = "N(L,I,I)";

     
     public MCRawDataToEvio4Converter() 
     {}

@@ -85,9 +93,18 @@

     
     public void process(EventHeader event) {
         

+        // Make a new EVIO event.

         EventBuilder builder = new EventBuilder(0, DataType.BANK, event.getEventNumber());

+        
+        // Write RawTrackerHit collection.

         writeRawTrackerHits(event.get(RawTrackerHit.class, rawTrackerHitCollectionName), builder);

-        writeRawCalorimeterHits(event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName), builder);

+        
+        // Write RawCalorimeterHit collection.
+        List<RawCalorimeterHit> rawCalorimeterHits = event.get(RawCalorimeterHit.class, rawCalorimeterHitCollectionName); 
+        LCMetaData meta = event.getMetaData(rawCalorimeterHits);
+        writeRawCalorimeterHits(meta, rawCalorimeterHits, builder);
+        
+        // Write this EVIO event.

         builder.setAllHeaderLengths();
         try {
             writer.writeEvent(builder.getEvent());

@@ -101,7 +118,10 @@

     public void writeRawTrackerHits(List<RawTrackerHit> rawTrackerHits, EventBuilder builder) {
 
         int dataSize = rawTrackerHits.size();

-        CompositeData.Data data = new CompositeData.Data();

+        
+        System.out.println("writeRawTrackerHits will write " + dataSize + " hits");
+                                             
+        CompositeData.Data data = new CompositeData.Data();       

         data.addN(dataSize);     
         for (RawTrackerHit hit : rawTrackerHits) {
             data.addLong(hit.getCellID());

@@ -128,24 +148,24 @@

             throw new RuntimeException(e);
         }
     }

-    
-    public void writeRawCalorimeterHits(List<RawCalorimeterHit> rawCalorimeterHits, EventBuilder builder) {

+       
+    public void writeRawCalorimeterHitCollection(List<RawCalorimeterHit> hits, int bankTag, EventBuilder builder) {

         CompositeData.Data data = new CompositeData.Data();

-        int nhits = rawCalorimeterHits.size();
-        data.addN(nhits);
-        for (RawCalorimeterHit hit : rawCalorimeterHits) {

+        int nTopHits = hits.size();
+        data.addN(nTopHits);
+        for (RawCalorimeterHit hit : hits) {

             data.addLong(hit.getCellID());
             data.addInt(hit.getAmplitude());
             data.addInt(hit.getTimeStamp());

-        }        

+        }

         CompositeData cdata = null;
         try {

-            cdata = new CompositeData(ecalFormat, 1, data, 0 ,0);

+            cdata = new CompositeData(ecalFormat, 1, data, 0, 0);

         }
         catch (EvioException e) {
             throw new RuntimeException(e);

-        }        
-        EvioBank bank = new EvioBank(ecalBankTag, DataType.COMPOSITE, ecalBankNumber);

+        }
+        EvioBank bank = new EvioBank(bankTag, DataType.COMPOSITE, ecalBankNumber);

         try {
             bank.appendCompositeData(cdata);
         } catch (EvioException e) {

@@ -158,4 +178,28 @@

             throw new RuntimeException(e);
         }
     }

+    
+    public void writeRawCalorimeterHits(LCMetaData meta, List<RawCalorimeterHit> rawCalorimeterHits, EventBuilder builder) {
+        
+        // Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
+        IDDecoder dec = meta.getIDDecoder();
+        List<RawCalorimeterHit> topHits = new ArrayList<RawCalorimeterHit>();
+        List<RawCalorimeterHit> bottomHits = new ArrayList<RawCalorimeterHit>();        
+        for (RawCalorimeterHit hit : rawCalorimeterHits) {
+            dec.setID(hit.getCellID());
+            int iy = dec.getValue("iy");
+            // Negative iy should be bottom section.
+            if (iy < 0) {
+                bottomHits.add(hit);
+            }
+            // Positive iy should be top section.
+            else {
+                topHits.add(hit);
+            }
+        }
+        
+        // Write the two collections for top and bottom hits to separate EVIO banks.
+        writeRawCalorimeterHitCollection(topHits, ecalTopBankTag, builder);
+        writeRawCalorimeterHitCollection(bottomHits, ecalBottomBankTag, builder);        
+    }      

 }

\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/monitoring

diff -N ConnectionParameters.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ConnectionParameters.java	22 Mar 2012 02:21:16 -0000	1.1
@@ -0,0 +1,128 @@

+package org.lcsim.hps.monitoring;
+
+import org.jlab.coda.et.EtConstants;
+
+/**
+ * Connection parameters for ET system.
+ */
+public class ConnectionParameters {
+
+    public String etName = null;
+    public String host = null;
+    public int port = EtConstants.serverPort;
+    public boolean blocking = true;
+    public boolean verbose = false;
+    public String statName = null;
+    public int chunk = 1;
+    public int neventsPerArray;
+    public int qSize = 0;
+    public int position = 1;
+    public int pposition = 0;
+    public int flowMode = EtConstants.stationSerial;
+    
+    public class ConnectionParametersException extends RuntimeException {
+        ConnectionParametersException(String msg) {
+            super(msg);
+        }
+    }
+
+    public static final void usage() {
+        System.out.println("\nUsage: java Consumer -f <et name> -host <ET host> -s <station name> [-h] [-v] [-nb]\n" +
+                "                      [-p <ET server port>] [-c <chunk size>] [-q <queue size>]\n" +
+                "                      [-pos <station position>] [-ppos <parallel station position>]\n\n" +
+                "       -host  ET system's host\n" +
+                "       -f     ET system's (memory-mapped file) name\n" +
+                "       -s     create station of this name\n" +
+                "       -h     help\n" +
+                "       -v     verbose output\n" +
+                "       -nb    make station non-blocking\n" +
+                "       -p     ET server port\n" +
+                "       -c     number of events in one get/put array\n" +
+                "       -q     queue size if creating nonblocking station\n" +
+                "       -pos   position of created station in station list (1,2,...)\n" +
+                "       -ppos  position of created station within a group of parallel stations (-1=end, -2=head)\n\n" +
+                "        This consumer works by making a direct connection\n" +
+                "        to the ET system's tcp server port.\n");
+    }
+
+    /**
+     * Setup this ConnectionParameters object from command line arguments.
+     * 
+     * @param args
+     * @return
+     */
+    public void setup(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equalsIgnoreCase("-f")) {
+                etName = args[++i];
+            } else if (args[i].equalsIgnoreCase("-host")) {
+                host = args[++i];
+            } else if (args[i].equalsIgnoreCase("-nb")) {
+                blocking = false;
+            } else if (args[i].equalsIgnoreCase("-v")) {
+                verbose = true;
+            } else if (args[i].equalsIgnoreCase("-s")) {
+                statName = args[++i];
+            } else if (args[i].equalsIgnoreCase("-p")) {
+                try {
+                    port = Integer.parseInt(args[++i]);
+                    if ((port < 1024) || (port > 65535)) {
+                        throw new ConnectionParametersException("Port number must be between 1024 and 65535.");
+                    }
+                } catch (NumberFormatException ex) {
+                    throw new ConnectionParametersException("Did not specify a proper port number.");
+                }
+            } else if (args[i].equalsIgnoreCase("-c")) {
+                try {
+                    chunk = Integer.parseInt(args[++i]);
+                    if ((chunk < 1) || (chunk > 1000)) {
+                        throw new ConnectionParametersException("Chunk size must be 1 - 1000.");
+                    }
+                } catch (NumberFormatException ex) {
+                    throw new ConnectionParametersException("Did not specify a proper chunk size.");
+                }
+            } else if (args[i].equalsIgnoreCase("-q")) {
+                try {
+                    qSize = Integer.parseInt(args[++i]);
+                    if (qSize < 1) {
+                        throw new ConnectionParametersException("Queue size must be > 0.");
+                    }
+                } catch (NumberFormatException ex) {
+                    throw new ConnectionParametersException("Did not specify a proper queue size number.");
+                }
+            } else if (args[i].equalsIgnoreCase("-pos")) {
+                try {
+                    position = Integer.parseInt(args[++i]);
+                    if (position < 1) {
+                        throw new ConnectionParametersException("Position must be > 0.");
+                    }
+                } catch (NumberFormatException ex) {
+                    throw new ConnectionParametersException("Did not specify a proper position number.");
+                }
+            } else if (args[i].equalsIgnoreCase("-ppos")) {
+                try {
+                    pposition = Integer.parseInt(args[++i]);
+                    if (pposition < -2 || pposition == 0) {
+                        throw new ConnectionParametersException("Parallel position must be > -3 and != 0.");
+                    }
+                    System.out.println("FLOW moDE is ||");
+                    flowMode = EtConstants.stationParallel;
+                    if (pposition == -2) {
+                        pposition = EtConstants.newHead;
+                    } else if (pposition == -1) {
+                        pposition = EtConstants.end;
+                    }
+
+                } catch (NumberFormatException ex) {
+                    throw new ConnectionParametersException("Did not specify a proper parallel position number.");
+                }
+            } else {
+                throw new ConnectionParametersException("Arguments included invalid command line parameter.");
+            }
+        }
+
+        if (host == null || etName == null || statName == null) {
+            throw new ConnectionParametersException("Missing required arguments.");
+        }
+    }
+}

\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.1 -r1.2
--- TrackerHitDriver.java	16 Mar 2012 19:11:11 -0000	1.1
+++ TrackerHitDriver.java	22 Mar 2012 02:21:17 -0000	1.2
@@ -34,11 +34,12 @@

  * algorithm like Seed Tracker.
  * 
  * @author jeremym

- * @version $Id: TrackerHitDriver.java,v 1.1 2012/03/16 19:11:11 jeremy Exp $

+ * @version $Id: TrackerHitDriver.java,v 1.2 2012/03/22 02:21:17 jeremy Exp $

  */
 public class TrackerHitDriver extends Driver {

+    

     // Debug switch for development.

-    private static final boolean DEBUG = false;

+    private boolean debug = false;

 
     // Collection name.
     private String readoutCollectionName = "TrackerHits";

@@ -87,6 +88,14 @@

 
     // Digi class objects.
     private StripHitMaker stripClusterer;

+    
+    public void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+    
+    public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
+        this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
+    }

 
     public void setReadoutCollectionName(String readoutCollectionName) {
         this.readoutCollectionName = readoutCollectionName;

@@ -257,11 +266,6 @@

             sensorMap.put(sensor.getIdentifier().getValue(), sensor);
         }
     }

-
-    public void setRawTrackerHitCollectionName(
-            String rawTrackerHitCollectionName) {
-        this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
-    }

     
     private static IIdentifier makeSensorId(Detector detector, RawTrackerHit hit) {
         

@@ -288,6 +292,9 @@

 
         // Read RawTrackerHits from LCSimEvent.
         List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);

+        
+        if (debug)
+            System.out.println("RawTrackerHit collection " + rawTrackerHitCollectionName + " has " + rawHits.size() + " hits.");

                
         // Add hits to sensors.
         for (RawTrackerHit hit : rawHits) {            

@@ -302,16 +309,18 @@

         // Make strip hits.
         List<SiTrackerHit> stripHits1D = new ArrayList<SiTrackerHit>();
         for (SiSensor sensor : processSensors) {

-            //System.out.println("making TrackerHits for sensor " + sensor.getName() + " with " + sensor.getReadout().getHits(RawTrackerHit.class).size() + " hits");

+            if (debug)
+                System.out.println("Making TrackerHits for sensor " + sensor.getName() + " with " + sensor.getReadout().getHits(RawTrackerHit.class).size() + " hits.");

             List<SiTrackerHit> trackerHits = stripClusterer.makeHits(sensor);

-            //System.out.println("made " + trackerHits.size() + " hits on sensor " + sensor.getName());

+            if (debug)
+                System.out.println("Made " + trackerHits.size() + " hits on sensor " + sensor.getName() + ".");

             stripHits1D.addAll(trackerHits);
         }
 
         // Debug prints.

-        //if (DEBUG) {
-        //    System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
-        //}

+        if (debug) {
+            System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
+        }

 
         // Put output TrackerHits into event.
         // FIXME Does this collection need a non-zero flag?

hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.13 -r1.14
--- TrackerReconDriver.java	19 Mar 2012 21:59:24 -0000	1.13
+++ TrackerReconDriver.java	22 Mar 2012 02:21:17 -0000	1.14
@@ -23,7 +23,7 @@

  * with the {@link TrackerDigiDriver} digitization Driver.
  * 
  * @author jeremym

- * @version $Id: TrackerReconDriver.java,v 1.13 2012/03/19 21:59:24 jeremy Exp $

+ * @version $Id: TrackerReconDriver.java,v 1.14 2012/03/22 02:21:17 jeremy Exp $

  */
 public final class TrackerReconDriver extends Driver {
     

@@ -147,8 +147,7 @@

         // Cache Detector object.
         this.detector = detector;
 

-        // Get B-field Y with no sign. Seed Tracker doesn't like signed B-field
-        // components.

+        // Get B-field Y with no sign. Seed Tracker doesn't like signed B-field components.

         // FIXME Is this always right?
         this.bfield = Math.abs((detector.getFieldMap().getField(new BasicHep3Vector(0, 0, 0)).y()));
         if (debug)

hps-java/src/main/resources/org/lcsim/hps/steering

diff -u -r1.1 -r1.2
--- EtTest.lcsim	16 Mar 2012 19:09:57 -0000	1.1
+++ EtTest.lcsim	22 Mar 2012 02:21:17 -0000	1.2
@@ -10,42 +10,33 @@

         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>
     </control>

-
-<!--    
-    <classpath>
-        <jar>~/.m2/repository/org/lcsim/hps-java/1.0-SNAPSHOT/hps-java-1.0-SNAPSHOT.jar</jar>
-    </classpath>
--->

     
     <execute>

-        <driver name="EventMarkerDriver"/>

         <driver name="SVTSetupDriver"/>

-<!--
-        <driver name="TrackerDigiDriver"/>
--->

+        <driver name="EventMarkerDriver"/>

         <driver name="TrackerHitDriver"/>
         <driver name="TrackerReconDriver"/>
     </execute>
     
     <drivers>
 

-        <driver name="TrackerHitDriver"
-                type="org.lcsim.hps.recon.tracking.TrackerHitDriver"/>
-

         <driver name="SVTSetupDriver"
                 type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">   
         </driver>
 
         <driver name="EventMarkerDriver"
                 type="org.lcsim.job.EventMarkerDriver">

-            <eventInterval>100</eventInterval>

+            <eventInterval>1</eventInterval>

         </driver>

-    
-        <driver name="TrackerDigiDriver"
-                type="org.lcsim.hps.recon.tracking.TrackerDigiDriver"/>
-                

+
+        <driver name="TrackerHitDriver"
+                type="org.lcsim.hps.recon.tracking.TrackerHitDriver">
+            <debug>true</debug>
+        </driver>
+                    

         <driver name="TrackerReconDriver"
                 type="org.lcsim.hps.recon.tracking.TrackerReconDriver">

+            <debug>true</debug>

             <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt0.xml</strategyResource>
             <stripMaxSeparation>20.0</stripMaxSeparation>
             <stripTolerance>1.0</stripTolerance>