3 modified files
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.7 -r1.8
--- LoadMyCalorimeterHit.java 6 Jul 2006 00:30:26 -0000 1.7
+++ LoadMyCalorimeterHit.java 7 May 2010 19:01:21 -0000 1.8
@@ -1,20 +1,16 @@
package org.lcsim.recon.cluster.directedtree;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import org.lcsim.event.EventHeader;
import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.segmentation.SegmentationBase;
-import org.lcsim.geometry.compact.Readout;
-import org.lcsim.geometry.Subdetector;
import org.lcsim.recon.cluster.util.CalHitMapMgr;
import org.lcsim.geometry.IDDecoder;
-import org.lcsim.util.aida.AIDA;
+import org.lcsim.recon.util.CalorimeterInformation;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;
public class LoadMyCalorimeterHit {
@@ -116,8 +112,11 @@
*/
public void setDefaultDensities() {
// load hit maps
- String[] colNames = {"EcalBarrDigiHits", "EcalEndcapDigiHits",
- "HcalBarrDigiHits", "HcalEndcapDigiHits"};
+ CalorimeterInformation ci = CalorimeterInformation.instance();
+ String[] colNames = {ci.getDigiCollectionName(CalorimeterType.EM_BARREL),
+ ci.getDigiCollectionName(CalorimeterType.EM_ENDCAP),
+ ci.getDigiCollectionName(CalorimeterType.HAD_BARREL),
+ ci.getDigiCollectionName(CalorimeterType.HAD_ENDCAP)};
CalHitMapMgr dataMgr = CalHitMapMgr.getInstance();
for(int i=0; i<colNames.length; ++i) {
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.8 -r1.9
--- TrackMatchingDriver.java 2 Aug 2006 19:07:56 -0000 1.8
+++ TrackMatchingDriver.java 7 May 2010 19:01:21 -0000 1.9
@@ -11,24 +11,23 @@
import org.lcsim.util.Driver;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Track;
import org.lcsim.recon.ztracking.cheater.CheatTrack;
import org.lcsim.mc.fast.tracking.ReconTrack;
-import org.lcsim.geometry.compact.Subdetector;
-import org.lcsim.geometry.segmentation.BarrelCylinderSegmentationBase;
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import org.lcsim.geometry.layer.Layering;
import org.lcsim.util.swim.HelixSwimmer;
-import org.lcsim.event.ReconstructedParticle;
import org.lcsim.recon.cluster.util.CalHitMapMgr;
+import org.lcsim.recon.util.CalorimeterInformation;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;
+import org.lcsim.recon.util.CalInfoDriver;
/**
* A driver for track matching using the swimmer.
*
* @author Guilherme Lima
- * @version $Id: TrackMatchingDriver.java,v 1.8 2006/08/02 19:07:56 lima Exp $
+ * @version $Id: TrackMatchingDriver.java,v 1.9 2010/05/07 19:01:21 cassell Exp $
*/
public class TrackMatchingDriver extends Driver {
@@ -43,10 +42,20 @@
_emdv = emdv;
_hddu = hddu;
_hddv = hddv;
+ add(new CalInfoDriver());
}
public void process(EventHeader event) {
+ super.process(event);
+ if(ci == null)
+ {
+ ci = CalorimeterInformation.instance();
+ _embName = ci.getDigiCollectionName(CalorimeterType.EM_BARREL);
+ _hdbName = ci.getDigiCollectionName(CalorimeterType.EM_ENDCAP);
+ _emeName = ci.getDigiCollectionName(CalorimeterType.HAD_BARREL);
+ _hdeName = ci.getDigiCollectionName(CalorimeterType.HAD_ENDCAP);
+ }
if(_debug>0) {
System.out.println("******** Track to calorimeter hit matching ***");
}
@@ -280,6 +289,7 @@
private double _rhoMinHAD;
private int _emdu, _emdv, _hddu, _hddv;
+ private CalorimeterInformation ci;
private String _embName = "EcalBarrDigiHits";
private String _hdbName = "HcalBarrDigiHits";
private String _emeName = "EcalEndcapDigiHits";
lcsim/src/org/lcsim/recon/cluster/directedtree
diff -u -r1.6 -r1.7
--- DTreeAnalysis.java 2 Aug 2006 19:07:56 -0000 1.6
+++ DTreeAnalysis.java 7 May 2010 19:01:21 -0000 1.7
@@ -1,6 +1,5 @@
package org.lcsim.recon.cluster.directedtree;
-import java.io.IOException;
import java.text.NumberFormat;
import java.util.*;
import hep.aida.*;
@@ -16,21 +15,24 @@
import org.lcsim.event.Cluster;
import org.lcsim.util.lcio.SIOCluster;
import org.lcsim.geometry.compact.Readout;
-import org.lcsim.digisim.CellSelector;
import org.lcsim.recon.cluster.util.CalHitMapMgr;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.recon.cluster.util.SortClustersBySize;
import org.lcsim.geometry.util.BaseIDDecoder;
import org.lcsim.event.Track;
-import org.lcsim.mc.fast.tracking.ReconTrack;
import org.lcsim.recon.ztracking.cheater.CheatTrack;
+import org.lcsim.recon.util.CalorimeterInformation;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;
+import org.lcsim.recon.util.CalInfoDriver;
public class DTreeAnalysis extends Driver {
private int _debug=0;
+ private CalorimeterInformation ci;
// constructor
public DTreeAnalysis() {
+ add(new CalInfoDriver());
_runPar = new RunControlParameters();
_emEcut = _runPar.getEMmip() * _runPar.getEMthresh() / _runPar.getEMweight();
_hdEcut = _runPar.getHDmip() * _runPar.getHDthresh() / _runPar.getHDweight();
@@ -47,6 +49,8 @@
}
public void process(EventHeader event) {
+ super.process(event);
+ if(ci == null)ci = CalorimeterInformation.instance();
if(_skipEvent) return;
_evt = event;
_evtnum = event.getEventNumber();
@@ -55,10 +59,10 @@
}
_tree.cd("DirectedTree");
- String embName = "EcalBarrDigiHits";
- String emeName = "EcalEndcapDigiHits";
- String hdbName = "HcalBarrDigiHits";
- String hdeName = "HcalEndcapDigiHits";
+ String embName = ci.getDigiCollectionName(CalorimeterType.EM_BARREL);
+ String emeName = ci.getDigiCollectionName(CalorimeterType.EM_ENDCAP);
+ String hdbName = ci.getDigiCollectionName(CalorimeterType.HAD_BARREL);
+ String hdeName = ci.getDigiCollectionName(CalorimeterType.HAD_ENDCAP);
embhitmap = _expert.getCollHitMap(embName, _emEcut);
emehitmap = _expert.getCollHitMap(emeName, _emEcut);
hdbhitmap = _expert.getCollHitMap(hdbName, _hdEcut);
CVSspam 0.2.8
