Commit in lcsim/src/org/lcsim/rpc on MAIN
PadDigiDriver.java+5-81.3 -> 1.4

lcsim/src/org/lcsim/rpc
PadDigiDriver.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PadDigiDriver.java	6 Feb 2013 01:42:38 -0000	1.3
+++ PadDigiDriver.java	16 Apr 2013 23:35:26 -0000	1.4
@@ -18,6 +18,7 @@
 import org.lcsim.util.Driver;
 import org.lcsim.util.lcio.LCIOConstants;
 
+// TODO: Add cuts back and make new collection called digiName + "_cut".
 public class PadDigiDriver extends Driver
 { 
     // Charge distribution data.
@@ -107,12 +108,10 @@
         ArrayList<LCRelation> endcapRelations = new ArrayList<LCRelation>();
 
         // Run barrel digi.
-        IDDecoder decoder = event.getMetaData(barrelInputHits).getIDDecoder();
-        runPadDigi(decoder, barrelInputHits, barrelRpcHits, barrelRelations);
+        runPadDigi(event.getMetaData(barrelInputHits).getIDDecoder(), barrelInputHits, barrelRpcHits, barrelRelations);
         
         // Run endcap digi.
-        decoder = event.getMetaData(endcapInputHits).getIDDecoder();
-        runPadDigi(decoder, endcapInputHits, endcapRpcHits, endcapRelations);
+        runPadDigi(event.getMetaData(endcapInputHits).getIDDecoder(), endcapInputHits, endcapRpcHits, endcapRelations);
      
         // Collection flags.
         int flag = 0;
@@ -120,22 +119,20 @@
         flag = flag | (1 << LCIOConstants.RCHBIT_ID1);
         
         // Store final collection of barrel hits in event.
-        LCMetaData barrelMetaData = event.getMetaData(barrelInputHits);
         event.put(
                 barrelOutputCollection,
                 barrelRpcHits, 
                 CalorimeterHit.class, 
                 flag, 
-                barrelMetaData.getName());
+                event.getMetaData(barrelInputHits).getName());
         
         // Store final collection of endcap hits in event.
-        LCMetaData endcapMetaData = event.getMetaData(endcapInputHits);
         event.put(
                 endcapOutputCollection,
                 endcapRpcHits,
                 CalorimeterHit.class,
                 flag,
-                endcapMetaData.getName());
+                event.getMetaData(endcapInputHits).getName());
         
         // Barrel relations.
         event.put(barrelOutputRelationCollection, barrelRelations, LCRelation.class, 0);
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