Merge branch 'iss221' of https://github.com/JeffersonLab/hps-java into iss221

Author: Matthew Solt

ecal-readout-sim/src/main/java/org/hps/readout/ecal/InactiveSiHitReadout.java

@@ -0,0 +1,40 @@
+package org.hps.readout.ecal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.base.BaseSimTrackerHit;
+import org.lcsim.lcio.LCIOConstants;
+
+public class InactiveSiHitReadout extends TriggerableDriver {
+    
+    private static String COLLNAME = "TrackerHits_Inactive";
+    private List<SimTrackerHit> hits = new ArrayList<SimTrackerHit>();    
+    static final int FLAG = (1 << LCIOConstants.THBIT_MOMENTUM);
+    
+    public void process(EventHeader event) {
+        if (event.hasCollection(SimTrackerHit.class, COLLNAME)) {
+            List<SimTrackerHit> hits = event.get(SimTrackerHit.class, COLLNAME);
+            for (SimTrackerHit hit : hits) {
+                double hitTime = hit.getTime();
+                hitTime += ClockSingleton.getTime();
+                ((BaseSimTrackerHit)hit).setTime(hitTime);
+            }
+            hits.addAll(hits);
+        }
+        checkTrigger(event);
+    }
+
+    @Override
+    protected void processTrigger(EventHeader event) {
+        event.put(COLLNAME, hits, SimTrackerHit.class, FLAG, "TrackerHits");
+        hits.clear();
+    }
+
+    @Override
+    public int getTimestampType() {
+        return ReadoutTimestamp.SYSTEM_TRACKER;
+    }         
+}

evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java

@@ -58,11 +58,13 @@ public class TestRunTriggeredReconToLcio extends TriggerableDriver {
     List<SimTrackerHit> triggerTrackerHitsInactive = null;
     List<SimCalorimeterHit> triggerECalHits = null;
     List<SimTrackerHit> triggerECalScoringPlaneHits = null;
+    List<SimTrackerHit> inactiveSiHits = null;
     static final String ecalCollectionName = "EcalHits";
     static final String trackerCollectionName = "TrackerHits";
     static final String trackerInactiveCollectionName = "TrackerHits_Inactive";
     private final String relationCollectionName = "SVTTrueHitRelations";
     String ecalScoringPlaneHitsCollectionName = "TrackerHitsECal";
+    static final String inactiveSiCollectionName = "TrackerHits_Inactive";
     private int verbosity = 1;
     private boolean writeSvtData = true;
     private boolean writeEcalData = true;
@@ -223,6 +225,9 @@ protected void process(EventHeader event) {
                 if (event.hasCollection(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName)) {
                     triggerECalScoringPlaneHits = event.get(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName);
                 }
+                if (event.hasCollection(SimTrackerHit.class, inactiveSiCollectionName)) {
+                    inactiveSiHits = event.get(SimTrackerHit.class, inactiveSiCollectionName);
+                }
             } else {
                 triggerMCParticles = null;
                 triggerECalHits = null;
@@ -360,7 +365,16 @@ protected void processTrigger(EventHeader event) {
                     System.out.println("Adding " + triggerECalScoringPlaneHits.size() + " ECalTrackerHits");
                 }
             }
-        }
+            // iss221: Write inactive Si hits. --JM
+            if (inactiveSiHits != null) {
+                lcsimEvent.put(inactiveSiCollectionName, this.inactiveSiHits, SimTrackerHit.class, 0xc0000000);
+                if (verbosity >= 1) {
+                    System.out.println("Adding " + this.inactiveSiHits.size() + " to " + inactiveSiCollectionName);
+                }
+            }
+            
+        }               
+        
         lcsimEvent.put(ReadoutTimestamp.collectionName, event.get(ReadoutTimestamp.class, ReadoutTimestamp.collectionName));
         ++eventNum;
     }

steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1_Pass2.lcsim

@@ -12,6 +12,7 @@
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="SimpleSVTReadout" />
+        <driver name="InactiveSiHitReadout" />
         <driver name="TestRunReconToLcio"/>     
         <driver name="AidaSaveDriver"/>    
         <driver name="ClockDriver"/>     
@@ -72,7 +73,7 @@
             <energySlopeLow>0.600</energySlopeLow>
             <prescale>1</prescale>
             <outputFileName>${outputFile}.triggers.pairs1</outputFileName>
-            <!--<verbose>true</verbose>-->
+            <verbose>true</verbose>
         </driver>         
         <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
             <enablePileupCut>false</enablePileupCut>
@@ -91,5 +92,6 @@
             <writeSvtData>true</writeSvtData>
             <ecalMode>1</ecalMode>
         </driver>
+        <driver name="InactiveSiHitReadout" type="org.hps.readout.ecal.InactiveSiHitReadout" />
     </drivers>
 </lcsim>