Print

Print


Commit in hps-java on MAIN
src/main/resources/org/lcsim/hps/steering/ecal_example.lcsim+9-21.1 -> 1.2
.cvsignore+3-21.2 -> 1.3
src/main/java/org/lcsim/hps/recon/ecal/HPSEcalReadoutDriver.java+7-71.5 -> 1.6
+19-11
3 modified files
update ecal_example.lcsim with readout driver

hps-java/src/main/resources/org/lcsim/hps/steering
ecal_example.lcsim 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ecal_example.lcsim	16 May 2011 18:51:16 -0000	1.1
+++ ecal_example.lcsim	23 Aug 2011 22:35:12 -0000	1.2
@@ -25,10 +25,17 @@
                 type="org.lcsim.util.loop.LCIODriver">
             <outputFilePath>${inputFile}_ecalClusters</outputFilePath>
         </driver>
+        <driver name="HPSEcalReadoutDriver"
+                type="org.lcsim.hps.recon.ecal.HPSEcalReadoutDriver">
+            <readoutCycle>1</readoutCycle>
+            <ecalName>HPSEcalTest</ecalName>
+            <ecalCollectionName>EcalHits</ecalCollectionName>
+            <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
+        </driver>
         <driver name="EcalClusterer"
                 type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
             <ecalName>HPSEcalTest</ecalName>
-            <ecalCollectionName>EcalHits</ecalCollectionName>
+            <ecalCollectionName>EcalRawHits</ecalCollectionName>
         </driver>
         <driver name="EcalPlots"
                 type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
@@ -36,7 +43,7 @@
         </driver>
         <driver name="EventMarkerDriver"
                 type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
+            <eventInterval>100</eventInterval>
         </driver>
         <driver name="AidaSaveDriver"
                 type="org.lcsim.job.AidaSaveDriver">

hps-java
.cvsignore 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 May 2011 17:57:59 -0000	1.2
+++ .cvsignore	23 Aug 2011 22:35:13 -0000	1.3
@@ -1,5 +1,6 @@
 target
-.project
 .classpath
-.settings
+catalog.xml
 *.slcio
+.settings
+.project

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalReadoutDriver.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- HPSEcalReadoutDriver.java	23 Aug 2011 22:27:28 -0000	1.5
+++ HPSEcalReadoutDriver.java	23 Aug 2011 22:35:13 -0000	1.6
@@ -26,10 +26,10 @@
     //buffer for deposited energy
     Map<Long, Double> eDepMap = null;
     int hitType = 11;
-    //counts bunches for trigger clock
+    //counts bunches for readout clock
     int clock;
-    //number of bunches in trigger cycle
-    int triggerCycle = 1;
+    //number of bunches in readout cycle
+    int readoutCycle = 1;
 
     public HPSEcalReadoutDriver() {
     }
@@ -46,8 +46,8 @@
         this.ecalName = ecalName;
     }
 
-    public void setTriggerCycle(int triggerCycle) {
-        this.triggerCycle = triggerCycle;
+    public void setReadoutCycle(int readoutCycle) {
+        this.readoutCycle = readoutCycle;
     }
 
     public void startOfData() {
@@ -78,7 +78,7 @@
         putHits(hits);
 
         //if at the end of a readout cycle, write buffers to hits
-        if (clock % triggerCycle == 0) {
+        if (clock % readoutCycle == 0) {
             event.put(ecalRawCollectionName, readHits(), CalorimeterHit.class, 0);
         }
     }
@@ -96,7 +96,7 @@
     }
 
     public void putHits(List<CalorimeterHit> hits) {
-        //fill the trigger buffers
+        //fill the readout buffers
         for (CalorimeterHit hit : hits) {
             Double eDep = eDepMap.get(hit.getCellID());
             if (eDep == null) {
CVSspam 0.2.8