4 modified files
lcsim/src/org/lcsim/event
diff -u -r1.12 -r1.13
--- CalorimeterHit.java 4 May 2010 17:48:24 -0000 1.12
+++ CalorimeterHit.java 23 Nov 2010 18:53:54 -0000 1.13
@@ -8,7 +8,7 @@
* @see org.lcsim.event.Hit
* @author tonyj
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: CalorimeterHit.java,v 1.12 2010/05/04 17:48:24 ngraf Exp $
+ * @version $Id: CalorimeterHit.java,v 1.13 2010/11/23 18:53:54 jeremy Exp $
*/
public interface CalorimeterHit
extends HitWithPosition
@@ -24,6 +24,11 @@
public double getCorrectedEnergy();
/**
+ * The energy error.
+ */
+ public double getEnergyError();
+
+ /**
* The ID of the cell. This can be converted to a physical
* position using a IDDecoder object obtained from the hit
* or from the collection's MetaData object.
lcsim/src/org/lcsim/event/base
diff -u -r1.10 -r1.11
--- BaseCalorimeterHit.java 5 May 2010 15:53:07 -0000 1.10
+++ BaseCalorimeterHit.java 23 Nov 2010 18:53:54 -0000 1.11
@@ -11,12 +11,14 @@
/**
* Base implementation of CalorimeterHit.
* @author tonyj
- * @author Jeremy McCormick <[log in to unmask]>
+ * @author jeremym
+ * @version $Id: BaseCalorimeterHit.java,v 1.11 2010/11/23 18:53:54 jeremy Exp $
*/
public abstract class BaseCalorimeterHit extends BaseHitWithPosition implements CalorimeterHit
{
protected double rawEnergy = UNSET_CORRECTED_ENERGY;
protected double corrEnergy = UNSET_CORRECTED_ENERGY;
+ protected double energyError;
protected double[] position;
protected Hep3Vector positionVec;
protected double time;
@@ -99,4 +101,9 @@
compactId = new Identifier(id);
return compactId;
}
+
+ public double getEnergyError()
+ {
+ return energyError;
+ }
}
\ No newline at end of file
lcsim/src/org/lcsim/util/lcio
diff -u -r1.12 -r1.13
--- LCIOConstants.java 22 Nov 2010 21:05:36 -0000 1.12
+++ LCIOConstants.java 23 Nov 2010 18:53:54 -0000 1.13
@@ -23,6 +23,9 @@
int CHBIT_PDG = 28;
int RCHBIT_LONG = 31;
+
+ // store energy error
+ int RCHBIT_ENERGY_ERROR = 26;
// long(1) - short(0) , incl./excl. position
int RCHBIT_BARREL = 30;
lcsim/src/org/lcsim/util/lcio
diff -u -r1.12 -r1.13
--- SIOCalorimeterHit.java 5 May 2010 16:14:11 -0000 1.12
+++ SIOCalorimeterHit.java 23 Nov 2010 18:53:54 -0000 1.13
@@ -2,6 +2,7 @@
import hep.io.sio.SIOInputStream;
import hep.io.sio.SIOOutputStream;
+import hep.lcio.event.LCIO;
import java.io.IOException;
import org.lcsim.event.CalorimeterHit;
@@ -12,7 +13,7 @@
* SIO-based I/O implementation of the CalorimeterHit interface
*
* @author Guilherme Lima
- * @version $Id: SIOCalorimeterHit.java,v 1.12 2010/05/05 16:14:11 ngraf Exp $
+ * @version $Id: SIOCalorimeterHit.java,v 1.13 2010/11/23 18:53:54 jeremy Exp $
*/
class SIOCalorimeterHit extends BaseCalorimeterHit
{
@@ -26,6 +27,10 @@
}
this.id = ((long) cellid1)<<32 | cellid0;
this.corrEnergy = in.readFloat();
+ if (version>=1051 && LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_ENERGY_ERROR))
+ {
+ energyError = in.readFloat();
+ }
if (version>1002 && (flags&(1<<LCIOConstants.RCHBIT_TIME)) != 0)
{
@@ -63,6 +68,7 @@
}
out.writeFloat( (float)hit.getCorrectedEnergy() );
+ out.writeFloat( (float)hit.getEnergyError() );
if( LCIOUtil.bitTest( flags, LCIOConstants.RCHBIT_TIME)) {
out.writeFloat( (float)hit.getTime() );
CVSspam 0.2.8