Author: [log in to unmask]
Date: Mon Dec 22 21:47:51 2014
New Revision: 1804
Log:
fix minor issue with IC cluster collections; add IC and GTP clusters to lcsim file
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterIC.java
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterIC.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterIC.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterIC.java Mon Dec 22 21:47:51 2014
@@ -82,7 +82,8 @@
double minTime = 0.0;
// Maximum time cut window range. Units in ns.
double timeWindow = 20.0;
-
+ // The detector
+ HPSEcal3 ecal;;
public void setClusterCollectionName(String clusterCollectionName) {
this.clusterCollectionName = clusterCollectionName;
@@ -188,7 +189,7 @@
public void detectorChanged(Detector detector) {
// Get the calorimeter.
- HPSEcal3 ecal = (HPSEcal3) detector.getSubdetector(ecalName);
+ ecal = (HPSEcal3) detector.getSubdetector(ecalName);
// Store the map of neighbor crystals for the current calorimeter set-up.
neighborMap = ecal.getNeighborMap();
@@ -618,9 +619,7 @@
} //End event output loop.
int flag = 1 << LCIOConstants.CLBIT_HITS;
event.put(clusterCollectionName, clusterList, HPSEcalClusterIC.class, flag);
- event.put(rejectedHitName, rejectedHitList, CalorimeterHit.class, flag);
-
-
+ event.put(rejectedHitName, rejectedHitList, CalorimeterHit.class, flag,ecal.getReadout().getName());
}
public void endOfData() {
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim Mon Dec 22 21:47:51 2014
@@ -43,6 +43,7 @@
<!-- <clusterWindow>32.0</clusterWindow>-->
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <addEMin>0.010</addEMin>
</driver>
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<inputCollection>EcalCalHits</inputCollection>
