lcsim/src/org/lcsim/recon/cheater
diff -u -r1.3 -r1.4
--- CheatReconDriver.java 4 Feb 2010 17:45:32 -0000 1.3
+++ CheatReconDriver.java 8 Jun 2010 14:21:25 -0000 1.4
@@ -19,16 +19,10 @@
import org.lcsim.event.base.MCReconstructedParticle;
import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.recon.cluster.util.TraceOrigin;
import org.lcsim.recon.tracking.cheat.CheatTrackDriver;
-import org.lcsim.recon.particle.CheatParticleDriver;
import org.lcsim.event.util.CreateFinalStateMCParticleList;
import org.lcsim.digisim.DigiPackageDriver;
-import org.lcsim.recon.cluster.util.CalHitMapDriver;
-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.compact.Subdetector;
-import org.lcsim.detector.solids.Tube;
import org.lcsim.mc.fast.tracking.MCFastTracking;
import java.util.HashMap;
import java.util.List;
@@ -36,7 +30,6 @@
import java.util.Map;
import org.lcsim.util.lcio.LCIOConstants;
import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
import org.lcsim.util.aida.AIDA;
import org.lcsim.event.LCRelation;
import org.lcsim.digisim.MyLCRelation;
@@ -152,6 +145,8 @@
diginames[1] = ci.getDigiCollectionName(CalorimeterType.EM_ENDCAP);
diginames[2] = ci.getDigiCollectionName(CalorimeterType.HAD_BARREL);
diginames[3] = ci.getDigiCollectionName(CalorimeterType.HAD_ENDCAP);
+ emR = ci.getRMin(CalorimeterType.EM_BARREL);
+ emZ = ci.getZMin(CalorimeterType.EM_ENDCAP);
}
super.process(event);
List<MCParticle> initfs = event.get(MCParticle.class,inFSname);
@@ -507,33 +502,5 @@
}
return htd;
}
- protected void detectorChanged(Detector detector)
- {
- super.detectorChanged(detector);
-
- Map<String,Subdetector> subdets = detector.getSubdetectors();
- for (Subdetector subdet : subdets.values())
- {
- if (subdet.isCalorimeter())
- {
- if (subdet.getName().equals("EMBarrel"))
- {
- Tube tube = (Tube)subdet.getDetectorElement().getGeometry().getLogicalVolume().getSolid();
- emR = tube.getInnerRadius();
- double outerRadius = tube.getOuterRadius();
- double zHalfLength = tube.getZHalfLength();
- }
- if (subdet.getName().equals("EMEndcap"))
- {
- Tube tube = (Tube)subdet.getDetectorElement().getChildren().get(0).getGeometry().getLogicalVolume().getSolid();
- double zHalfLength = tube.getZHalfLength();
- Hep3Vector v = subdet.getDetectorElement().getChildren().get(0).getGeometry().getPosition();
- emZ = Math.abs(v.z()) - zHalfLength;
- }
- }
- }
- System.out.println("Detector change: innerZ = "+emZ+" innerR = "+emR);
-
- }
}