Author: [log in to unmask]
Date: Thu Jan 15 10:26:49 2015
New Revision: 1935
Log:
Updates to steering files from cluster changes.
Modified:
java/trunk/integration-tests/pom.xml
java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
Modified: java/trunk/integration-tests/pom.xml
=============================================================================
--- java/trunk/integration-tests/pom.xml (original)
+++ java/trunk/integration-tests/pom.xml Thu Jan 15 10:26:49 2015
@@ -38,7 +38,7 @@
<exclude>org/hps/ReadoutToEvioTest.java</exclude>
<exclude>org/hps/ReadoutToLcioTest.java</exclude>
<exclude>org/hps/SimpleSvtReadoutTest.java</exclude>
- <exclude>org/hps/ReconClusterICTest.java</exclude>
+ <exclude>org/hps/TestRunReadoutToEvioTest.java</exclude>
</excludes>
<!-- <redirectTestOutputToFile>true</redirectTestOutputToFile> -->
<trimStackTrace>false</trimStackTrace>
Modified: java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim
=============================================================================
--- java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim (original)
+++ java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim Thu Jan 15 10:26:49 2015
@@ -62,10 +62,8 @@
<useTimestamps>false</useTimestamps>
<useTruthTime>true</useTruthTime>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterICBasic">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <timeCut>true</timeCut>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.SimpleReconClusterDriver">
+ <useTimeCut>true</useTimeCut>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim Thu Jan 15 10:26:49 2015
@@ -35,11 +35,10 @@
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
</driver>
- <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <clusterWindow>0</clusterWindow>
- <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
- <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
+ <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
+ <clusterWindow>0</clusterWindow>
+ <inputHitCollectionName>EcalReadoutAnalogHits</inputHitCollectionName>
+ <outputClusterCollectionName>EcalTriggerClusters</outputClusterCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim Thu Jan 15 10:26:49 2015
@@ -46,10 +46,9 @@
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.CTPClusterDriver">
<clusterWindow>32.0</clusterWindow>
- <ecalCollectionName>EcalFilteredHits</ecalCollectionName>
+ <inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim Thu Jan 15 10:26:49 2015
@@ -49,10 +49,9 @@
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterICBasic">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalHits</ecalCollectionName>
- <timeCut>false</timeCut>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>SimpleReconClusterer</clustererName>
+ <inputHitCollectionName>EcalHits</inputHitCollectionName>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"/>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim Thu Jan 15 10:26:49 2015
@@ -44,9 +44,8 @@
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver">
</driver>
