 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN | |||
| HPSEcalRawConverter.java | +1 | -41 | 1.1 -> 1.2 |
| HPSEcalRawConverterDriver.java | +3 | -5 | 1.1 -> 1.2 |
| +4 | -46 | ||
RawTrackerHit to CalorimeterHit converter
diff -u -r1.1 -r1.2 --- HPSEcalRawConverter.java 3 May 2012 00:14:54 -0000 1.1 +++ HPSEcalRawConverter.java 3 May 2012 00:17:54 -0000 1.2 @@ -95,59 +95,19 @@
}
-// public IExpandedIdentifier getIdentifier(short x, short y) {
-//
-// IIdentifierHelper helper = ecal.getDetectorElement().getIdentifierHelper();
-// IExpandedIdentifier expId = new ExpandedIdentifier(helper.getIdentifierDictionary().getNumberOfFields());
-// expId.setValue(helper.getFieldIndex("system"), ecal.getSystemID());
-//
-// expId.setValue(helper.getFieldIndex("ix"), x);
-// expId.setValue(helper.getFieldIndex("iy"), y);
-// return expId;
-//
-// }
public CalorimeterHit HitDtoA(RawTrackerHit hit) {
- //dec.setID(hit.getCellID()); - //return new HPSRawCalorimeterHit(DtoA(hit.getAmplitude(), hit.getCellID()), dec.getPosition(), period * hit.getTimeStamp() + dt, hit.getCellID(), 0);
double time = 0.0;
long id = hit.getCellID();
- int type = 0;
- //System.out.println("id " + id);
-
+ int type = 0;
double rawEnergy = (double) sumADC(hit);
- //IExpandedIdentifier expId = getIdentifier();
-// IDetectorElement detElem;
-// try {
-// detElem = hit.getDetectorElement();
-// }
-// catch (NullPointerException exc) {
-//
-// }
-//
-
-
-
- //System.out.println(hit.getDetectorElement().getName());
- //System.out.println(hit.getDetectorElement().getGeometry().getPosition().toString());
-
Hep3Vector pvec = hit.getDetectorElement().getGeometry().getPosition();
double [] pos = new double[3];
pos[0] = pvec.x();
pos[1] = pvec.y();
pos[2] = pvec.z();
CalorimeterHit h = new HPSRawCalorimeterHit(rawEnergy+0.0000001, null, time, id, 0);
- //System.out.println(" raw energy " + rawEnergy);
return h;
}
-// public CalorimeterHit HitDtoA(RawCalorimeterHit hit) {
-// dec.setID(hit.getCellID());
-// return new HPSRawCalorimeterHit(DtoA(hit.getAmplitude(), hit.getCellID()), dec.getPosition(), period * hit.getTimeStamp() + dt, hit.getCellID(), 0);
-// }
-
-// public RawCalorimeterHit HitAtoD(CalorimeterHit hit) {
-// dec.setID(hit.getCellID());
-// return new HPSFADCCalorimeterHit(hit.getCellID(), AtoD(hit.getRawEnergy(), hit.getCellID()), (int) Math.round(hit.getTime() / period), 0);
-// }
}
diff -u -r1.1 -r1.2 --- HPSEcalRawConverterDriver.java 3 May 2012 00:14:54 -0000 1.1 +++ HPSEcalRawConverterDriver.java 3 May 2012 00:17:54 -0000 1.2 @@ -16,7 +16,7 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalRawConverterDriver.java,v 1.1 2012/05/03 00:14:54 phansson Exp $
+ * @version $Id: HPSEcalRawConverterDriver.java,v 1.2 2012/05/03 00:17:54 phansson Exp $
*/
public class HPSEcalRawConverterDriver extends Driver {
@@ -87,10 +87,8 @@
ArrayList<CalorimeterHit> newHits = new ArrayList<CalorimeterHit>();
for (RawTrackerHit hit : hits) {
- //if (debug) System.out.println("Try to convert hit: " + hit.toString());
- //newHits.add(converter.HitDtoA(hit));
- //if (debug) System.out.println("Added hit (rawEnergy "+ newHits.get(newHits.size()-1).getRawEnergy() + "): " + newHits.get(newHits.size()-1).toString());
- }
+ newHits.add(converter.HitDtoA(hit)); + }
int flags = 0;
event.put(ecalCollectionName, newHits, CalorimeterHit.class, flags, ecalReadoutName);
String s = ecalCollectionName; //"EcalCalHits";
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1