12 modified files
java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -43,7 +43,7 @@
// continue;
if (eDepMap.get(cellID) > threshold)
h = new HPSCalorimeterHit(eDepMap.get(cellID), readoutTime(), cellID, hitType);
- h.setDetector(detector);
+ //h.setDetector(detector);
hits.add(h);
}
//reset hit integration
java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -54,7 +54,7 @@
// if (iy == 1 && ix == -2)
// System.out.printf("Time %f, output signal %f\n", ClockSingleton.getTime(), eDepBuffer.currentValue());
HPSCalorimeterHit h = new HPSCalorimeterHit(eDepBuffer.currentValue(), readoutTime(), cellID, hitType);
- h.setDetector(detector);
+ //h.setDetector(detector);
hits.add(h);
}
eDepBuffer.step();
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/CTPEcalClusterer.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/CTPEcalClusterer.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -355,12 +355,12 @@
// Generate a new cluster seed hit from the above results.
HPSCalorimeterHit seedHit = new HPSCalorimeterHit(0.0, clusterTime, possibleCluster, hits.get(0).getType());
- seedHit.setDetector(detector);
+ //seedHit.setDetector(detector);
seedHit.setMetaData(hits.get(0).getMetaData());
// Generate a new cluster from the seed hit.
HPSEcalCluster cluster = new HPSEcalCluster();
- cluster.setDetector(detector);
+ //cluster.setDetector(detector);
cluster.setSeedHit(seedHit);
// Populate the cluster with each of the chosen neighbors.
for (CalorimeterHit clusterHit : hits) {
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterer.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalClusterer.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -164,7 +164,7 @@
if (isSeed) {
// Make a cluster from the hit list.
HPSEcalCluster cluster = new HPSEcalCluster();
- cluster.setDetector(detector);
+ //cluster.setDetector(detector);
cluster.setSeedHit(hit);
cluster.addHit(hit);
for (CalorimeterHit clusHit : neighborHits) {
@@ -175,4 +175,4 @@
}
return clusters;
}
-}
\ No newline at end of file
+}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -87,7 +87,7 @@
private CalorimeterHit HitDtoA(RawCalorimeterHit hit) {
HPSCalorimeterHit h = new HPSCalorimeterHit(DtoA(hit.getAmplitude(), hit.getCellID()), period * hit.getTimeStamp() + dt, hit.getCellID(), 0);
- h.setDetector(detector);
+ //h.setDetector(detector);
return h;
}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -181,7 +181,7 @@
int truncatedIntegral = (int) Math.floor(triggerIntegral / truncateScale);
if (truncatedIntegral > 0) {
HPSCalorimeterHit h = new HPSCalorimeterHit(truncatedIntegral, hit.getTime(), hit.getCellID(), 0);
- h.setDetector(detector);
+ //h.setDetector(detector);
return h ;
}
return null;
@@ -222,7 +222,7 @@
// System.out.format("readout: %f %f\n", amplitude, integral);
HPSCalorimeterHit h = new HPSCalorimeterHit(integral, hit.getTime(), hit.getCellID(), 0);
- h.setDetector(detector);
+ //h.setDetector(detector);
return h;
}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -77,7 +77,7 @@
long id = hit.getCellID();
double rawEnergy = adcToEnergy(sumADC(hit), id);
HPSCalorimeterHit h1 = new HPSCalorimeterHit(rawEnergy + 0.0000001, time, id, 0);
- h1.setDetector(detector);
+ //h1.setDetector(detector);
// double[] pos = hit.getDetectorElement().getGeometry().getPosition().v();
//+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY
@@ -95,7 +95,7 @@
double adcSum = hit.getAmplitude() - window * channelData.getCalibration().getPedestal();
double rawEnergy = adcToEnergy(adcSum, id);
HPSCalorimeterHit h2 = new HPSCalorimeterHit(rawEnergy + 0.0000001, time + timeOffset, id, 0);
- h2.setDetector(detector);
+ //h2.setDetector(detector);
//+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY
return h2;
}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -207,7 +207,7 @@
truncatedIntegral = 0;
}
HPSCalorimeterHit h = new HPSCalorimeterHit(truncatedIntegral, hitTime, id, 0);
- h.setDetector(detector);
+ //h.setDetector(detector);
// CalorimeterHit h = new HPSRawCalorimeterHit(triggerIntegral + 0.0000001, hit.getPosition(), hitTime, id, 0);
//+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY
return h;
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -149,7 +149,7 @@
//make new hit; set position to null so it gets recalculated
HPSCalorimeterHit h = new HPSCalorimeterHit(hit.getRawEnergy(), hit.getTime()+delay*4, newID, hit.getType());
- h.setDetector(detector);
+ //h.setDetector(detector);
return h;
}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/GTPEcalClusterer.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/GTPEcalClusterer.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -160,7 +160,7 @@
// Store the crystals that are part of this potential cluster,
// starting with the cluster seed candidate.
HPSEcalCluster cluster = new HPSEcalCluster();
- cluster.setDetector(detector);
+ //cluster.setDetector(detector);
cluster.setSeedHit(currentHit);
cluster.addHit(currentHit);
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -29,10 +29,10 @@
*/
public class HPSCalorimeterHit extends BaseCalorimeterHit {
- Detector detector = null;
- static EcalConditions ecalConditions = null;
- static IIdentifierHelper helper = null;
- static EcalChannelCollection channels = null;
+ //Detector detector = null;
+ //static EcalConditions ecalConditions = null;
+ //static IIdentifierHelper helper = null;
+ //static EcalChannelCollection channels = null;
/**
* Fully qualified constructor that sets rawEnergy
@@ -103,7 +103,7 @@
public IDetectorElement getDetectorElement() {
if (de == null) {
// findDetectorElementByPosition();
- IDetectorElementContainer detectorElements = detector.getDetectorElement().findDetectorElement(getIdentifier());
+ IDetectorElementContainer detectorElements = getSubdetector().getDetectorElement().findDetectorElement(getIdentifier());
if (detectorElements.size() != 1) {
throw new RuntimeException("Expected exactly one DetectorElement matching ID " + getIdentifier() + ", got " + detectorElements.size());
} else {
@@ -114,12 +114,12 @@
return de;
}
- @Override
+ //@Override
public double[] getPosition() {
return getPositionVec().v();
}
- @Override
+ //@Override
public Hep3Vector getPositionVec() {
return this.getDetectorElement().getGeometry().getPosition();
}
@@ -136,6 +136,7 @@
* Must be set when an object HPSCalorimeterHit is created.
* @param detector (long)
*/
+/*
public void setDetector(Detector detector) {
this.detector = detector;
@@ -151,6 +152,6 @@
// System.out.println("You are now using the database conditions for HPSCalorimeterHit.");
}
+*/
-
}
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalCluster.java 2014-09-12 03:37:37 UTC (rev 1014)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalCluster.java 2014-09-12 03:53:58 UTC (rev 1015)
@@ -26,7 +26,7 @@
*/
public class HPSEcalCluster extends BaseCluster {
- Detector detector = null;
+ //Detector detector = null;
static EcalConditions ecalConditions = null;
static IIdentifierHelper helper = null;
static EcalChannelCollection channels = null;
@@ -66,7 +66,7 @@
*/
public void setSeedHit(CalorimeterHit seedHit) {
this.seedHit = new HPSCalorimeterHit(seedHit);
- ((HPSCalorimeterHit) seedHit).setDetector(detector);
+ //((HPSCalorimeterHit) seedHit).setDetector(detector);
this.cellID = seedHit.getCellID();
}
@@ -82,7 +82,7 @@
throw new RuntimeException("HPSEcalCluster has no hits");
}
seedHit = new HPSCalorimeterHit(0.0, 0.0, cellID, hit.getType());
- seedHit.setDetector(detector);
+ //seedHit.setDetector(detector);
seedHit.setMetaData(hit.getMetaData());
}
return seedHit;
@@ -92,9 +92,9 @@
* Must be set when an object HPSEcalCluster is created.
* @param detector (long)
*/
- public void setDetector(Detector detector) {
- this.detector = detector;
- }
+ //public void setDetector(Detector detector) {
+ // this.detector = detector;
+ //}
/**
* Find highest-energy hit in a cluster. For clusters made by GTPEcalClusterer, HPSEcalCluster.getSeedHit(cluster) should be equivalent to cluster.getSeedHit().
SVNspam 0.1