23 modified files
lcio/doc
diff -u -r1.71 -r1.72
--- lcio.xml 1 Jun 2010 10:19:36 -0000 1.71
+++ lcio.xml 2 Jun 2010 10:59:33 -0000 1.72
@@ -93,7 +93,13 @@
<repeat count="n">
<data type="int" name="cellID">Detector specific</data>
<data type="double[3]" name="position"></data>
- <data type="float" name="dedx"></data>
+
+ <if condition="1000*major+minor>1012">
+ <data type="float" name="EDep">energy deposited on the hit</data>
+ <else/>
+ <data type="float" name="dedx">DEPRECATED. renamed to EDep</data>
+ </if>
+
<data type="float" name="time"></data>
<data type="pntr" name="MCParticle"></data>
<if condition="(flags&(1<<30)) != 0">
@@ -243,17 +249,16 @@
</if>
<data type="double[3]" name="position"></data>
<data type="float[6]" name="covariance">Covariance Matrix of position (x,y,z)</data>
- <if condition="1000*major+minor<1013">
- <data type="float" name="dedx"></data>
+ <if condition="1000*major+minor>1012">
+ <data type="float" name="EDep">energy deposited on the hit</data>
+ <data type="float" name="EDepError">error measured on EDep</data>
+ <else/>
+ <data type="float" name="dedx">DEPRECATED. renamed to EDep</data>
</if>
<data type="float" name="time"></data>
<if condition="1000*major+minor>1011">
<data type="int" name="quality">quality flag word</data>
</if>
- <if condition="1000*major+minor>1012">
- <data type="float" name="charge"></data>
- <data type="float" name="chargeError"></data>
- </if>
<if condition="1000*major+minor>1002">
<data type="int" name="nRawHits">number of raw hits</data>
<repeat count="nRawHits">
lcio/src/aid/EVENT
diff -u -r1.9 -r1.10
--- SimTrackerHit.aid 24 Mar 2006 13:25:52 -0000 1.9
+++ SimTrackerHit.aid 2 Jun 2010 10:59:33 -0000 1.10
@@ -3,7 +3,7 @@
/** A generic simulated tracker hit.
*
* @author gaede
- * @version $Id: SimTrackerHit.aid,v 1.9 2006/03/24 13:25:52 gaede Exp $
+ * @version $Id: SimTrackerHit.aid,v 1.10 2010/06/02 10:59:33 engels Exp $
*/
public interface SimTrackerHit extends LCObject {
@@ -25,9 +25,14 @@
public const double3V getPosition() const ;
/** Returns the dE/dx of the hit in [GeV].
- */
+ * DEPRECATED. renamed to getEDep()
+ */
public float getdEdx() const ;
-
+
+ /** The energy deposited on the hit [GeV]
+ */
+ public float getEDep() const ;
+
/** Returns the time of the hit in [ns]. TO DO needs definition.
*/
public float getTime() const ;
lcio/src/aid/EVENT
diff -u -r1.14 -r1.15
--- TrackerHit.aid 1 Jun 2010 10:19:36 -0000 1.14
+++ TrackerHit.aid 2 Jun 2010 10:59:33 -0000 1.15
@@ -11,7 +11,7 @@
/** A generic tracker hit to be used by pattern recognition.
*
* @author gaede
- * @version $Id: TrackerHit.aid,v 1.14 2010/06/01 10:19:36 engels Exp $
+ * @version $Id: TrackerHit.aid,v 1.15 2010/06/02 10:59:33 engels Exp $
*/
public interface TrackerHit extends LCObject {
@@ -34,9 +34,8 @@
public const FloatVec& getCovMatrix() const ;
/** The dE/dx of the hit in [GeV].
- *
- * DEPRECATED. Please use getCharge() instead.
- */
+ * DEPRECATED. renamed to getEDep()
+ */
public float getdEdx() const ;
/** The time of the hit in [ns].
@@ -58,11 +57,11 @@
/** The quality bit flag of the hit */
public int getQuality() const ;
- /** The charge */
- public float getCharge() const ;
+ /** The energy deposited on the hit [GeV] */
+ public float getEDep() const ;
- /** The charge error*/
- public float getChargeError() const ;
+ /** The error measured on EDep [GeV] */
+ public float getEDepError() const ;
/** The raw data hits.
* Check getType() to get actual data type.
lcio/src/cpp/include/CPPFORT
diff -u -r1.4 -r1.5
--- lcsth.h 24 Mar 2006 13:36:43 -0000 1.4
+++ lcsth.h 2 Jun 2010 10:59:33 -0000 1.5
@@ -17,6 +17,7 @@
float lcsthgetmomentum( PTRTYPE hit, int index ) ;
float lcsthgetpathlength ( PTRTYPE hit ) ;
float lcsthgetdedx( PTRTYPE hit ) ;
+float lcsthgetedep( PTRTYPE hit ) ;
float lcsthgettime( PTRTYPE hit ) ;
PTRTYPE lcsthgetmcparticle( PTRTYPE hit ) ;
@@ -27,6 +28,7 @@
int lcsthsetmomentumxyz( PTRTYPE hit, float px, float py, float pz ) ;
int lcsthsetpathlength( PTRTYPE hit, float pathLength ) ;
int lcsthsetdedx( PTRTYPE hit, float dEdX ) ;
+int lcsthsetedep( PTRTYPE hit, float e ) ;
int lcsthsettime( PTRTYPE hit, float t ) ;
int lcsthsetmcparticle( PTRTYPE hit, PTRTYPE particle ) ;
@@ -41,6 +43,7 @@
FCALLSCFUN2(FLOAT, lcsthgetmomentum, LCSTHGETMOMENTUM, lcsthgetmomentum, CFORTRANPNTR, INT )
FCALLSCFUN1(FLOAT, lcsthgetpathlength,LCSTHGETPATHLENGTH,lcsthgetpathlength,CFORTRANPNTR)
FCALLSCFUN1(FLOAT, lcsthgetdedx,LCSTHGETDEDX,lcsthgetdedx,CFORTRANPNTR)
+FCALLSCFUN1(FLOAT, lcsthgetedep,LCSTHGETEDEP,lcsthgetedep,CFORTRANPNTR)
FCALLSCFUN1(FLOAT, lcsthgettime,LCSTHGETTIME,lcsthgettime,CFORTRANPNTR)
FCALLSCFUN1(CFORTRANPNTR,lcsthgetmcparticle,LCSTHGETMCPARTICLE,lcsthgetmcparticle,CFORTRANPNTR)
@@ -52,6 +55,7 @@
FLOAT, FLOAT, FLOAT )
FCALLSCFUN2(INT, lcsthsetpathlength, LCSTHSETPATHLENGTH, lcsthsetpathlength, CFORTRANPNTR, FLOAT )
FCALLSCFUN2(INT, lcsthsetdedx, LCSTHSETDEDX, lcsthsetdedx, CFORTRANPNTR, FLOAT )
+FCALLSCFUN2(INT, lcsthsetedep, LCSTHSETEDEP, lcsthsetedep, CFORTRANPNTR, FLOAT )
FCALLSCFUN2(INT, lcsthsettime, LCSTHSETTIME, lcsthsettime, CFORTRANPNTR, FLOAT )
FCALLSCFUN2(INT, lcsthsetmcparticle, LCSTHSETMCPARTICLE, lcsthsetmcparticle, CFORTRANPNTR, CFORTRANPNTR )
}
lcio/src/cpp/include/CPPFORT
diff -u -r1.9 -r1.10
--- lctrh.h 1 Jun 2010 10:19:36 -0000 1.9
+++ lctrh.h 2 Jun 2010 10:59:33 -0000 1.10
@@ -1,7 +1,7 @@
/**Header file for the f77-wrapper functions of the Track Class.
*
* @author H. Vogt
- * @version $Id: lctrh.h,v 1.9 2010/06/01 10:19:36 engels Exp $
+ * @version $Id: lctrh.h,v 1.10 2010/06/02 10:59:33 engels Exp $
*/
#include "cfortran.h"
#include "cpointer.h"
@@ -16,22 +16,22 @@
int lctrhgetposition( PTRTYPE trh, double* pos ) ;
int lctrhgetcovmatrix( PTRTYPE trh, float* cvmtx ) ;
float lctrhgetdedx( PTRTYPE trh ) ;
+float lctrhgetedep( PTRTYPE trh ) ;
+float lctrhgetedeperr( PTRTYPE trh ) ;
float lctrhgettime( PTRTYPE trh ) ;
//char* lctrhgettype( PTRTYPE trh ) ;
int lctrhgettype( PTRTYPE trh ) ;
-float lctrhgetcharge( PTRTYPE trh ) ;
-float lctrhgetchargeerr( PTRTYPE trh ) ;
int lctrhgetquality( PTRTYPE trh ) ;
PTRTYPE lctrhgetrawhits( PTRTYPE trh ) ;
int lctrhsetposition( PTRTYPE trh, double* pos ) ;
int lctrhsetcovmatrix( PTRTYPE trh, float* cvmtx ) ;
-//int lctrhsetdedx( PTRTYPE trh, float dedx ) ;
+int lctrhsetdedx( PTRTYPE trh, float dedx ) ;
+int lctrhsetedep( PTRTYPE trh, float e ) ;
+int lctrhsetedeperr( PTRTYPE trh, float e ) ;
int lctrhsettime( PTRTYPE trh, float time ) ;
int lctrhsettype( PTRTYPE trh, int type ) ;
-int lctrhsetcharge( PTRTYPE trh, float charge ) ;
-int lctrhsetchargeerr( PTRTYPE trh, float error ) ;
int lctrhsetquality( PTRTYPE trh, int q );
int lctrhaddrawhit( PTRTYPE trh, PTRTYPE rawhit ) ;
@@ -45,22 +45,22 @@
FCALLSCFUN1(INT, lctrhid, LCTRHID, lctrhid, CFORTRANPNTR)
FCALLSCFUN2(INT, lctrhgetposition, LCTRHGETPOSITION, lctrhgetposition, CFORTRANPNTR, DOUBLEV )
FCALLSCFUN2(INT, lctrhgetcovmatrix, LCTRHGETCOVMATRIX, lctrhgetcovmatrix, CFORTRANPNTR, FLOATV)
-FCALLSCFUN1(FLOAT, lctrhgetdedx, LCTRHGETDEDX, lctrhgetdedx, CFORTRANPNTR)
+FCALLSCFUN1(FLOAT, lctrhgetdedx, LCTRHGETDEDX, lctrhgetdedx, CFORTRANPNTR)
+FCALLSCFUN1(FLOAT, lctrhgetedep, LCTRHGETEDEP, lctrhgetedep, CFORTRANPNTR)
+FCALLSCFUN1(FLOAT, lctrhgetedeperr, LCTRHGETEDEPERR, lctrhgetedeperr, CFORTRANPNTR)
FCALLSCFUN1(FLOAT, lctrhgettime, LCTRHGETTIME, lctrhgettime, CFORTRANPNTR)
//FCALLSCFUN1(STRING, lctrhgettype, LCTRHGETTYPE, lctrhgettype, CFORTRANPNTR )
FCALLSCFUN1(INT, lctrhgettype, LCTRHGETTYPE, lctrhgettype, CFORTRANPNTR )
-FCALLSCFUN1(FLOAT, lctrhgetcharge, LCTRHGETCHARGE, lctrhgetcharge, CFORTRANPNTR)
-FCALLSCFUN1(FLOAT, lctrhgetchargeerr, LCTRHGETCHARGEERR, lctrhgetchargeerr, CFORTRANPNTR)
FCALLSCFUN1(INT, lctrhgetquality,LCTRHGETQUALITY, lctrhgetquality,CFORTRANPNTR)
FCALLSCFUN1(CFORTRANPNTR, lctrhgetrawhits, LCTRHGETRAWHITS, lctrhgetrawhits, CFORTRANPNTR)
FCALLSCFUN2(INT, lctrhsetposition, LCTRHSETPOSITION, lctrhsetposition, CFORTRANPNTR, DOUBLEV)
FCALLSCFUN2(INT, lctrhsetcovmatrix, LCTRHSETCOVMATRIX, lctrhsetcovmatrix, CFORTRANPNTR, FLOATV)
-//FCALLSCFUN2(INT, lctrhsetdedx, LCTRHSETDEDX, lctrhsetdedx, CFORTRANPNTR, FLOAT)
+FCALLSCFUN2(INT, lctrhsetdedx, LCTRHSETDEDX, lctrhsetdedx, CFORTRANPNTR, FLOAT)
+FCALLSCFUN2(INT, lctrhsetedep, LCTRHSETEDEP, lctrhsetedep, CFORTRANPNTR, FLOAT)
+FCALLSCFUN2(INT, lctrhsetedeperr, LCTRHSETEDEPERR, lctrhsetedeperr, CFORTRANPNTR, FLOAT)
FCALLSCFUN2(INT, lctrhsettime, LCTRHSETTIME, lctrhsettime, CFORTRANPNTR, FLOAT)
FCALLSCFUN2(INT, lctrhsettype, LCTRHSETTYPE, lctrhsettype, CFORTRANPNTR, INT )
-FCALLSCFUN2(INT, lctrhsetcharge, LCTRHSETCHARGE, lctrhsetcharge, CFORTRANPNTR, FLOAT)
-FCALLSCFUN2(INT, lctrhsetchargeerr, LCTRHSETCHARGEERR, lctrhsetchargeerr, CFORTRANPNTR, FLOAT)
FCALLSCFUN2(INT, lctrhsetquality, LCTRHSETQUALITY, lctrhsetquality, CFORTRANPNTR, INT )
FCALLSCFUN2(INT, lctrhaddrawhit, LCTRHADDRAWHIT, lctrhaddrawhit, CFORTRANPNTR, CFORTRANPNTR)
lcio/src/cpp/include/IMPL
diff -u -r1.12 -r1.13
--- SimTrackerHitImpl.h 4 Aug 2006 16:52:46 -0000 1.12
+++ SimTrackerHitImpl.h 2 Jun 2010 10:59:33 -0000 1.13
@@ -40,9 +40,15 @@
virtual const double * getPosition() const ;
/** Returns the dE/dx of the hit.
+ * DEPRECATED. renamed to getEDep()
*/
virtual float getdEdx() const ;
+ /** Returns the deposited energy of the hit [GeV]
+ */
+ virtual float getEDep() const ;
+
+
/** Returns the time of the hit. TO DO needs definition.
*/
virtual float getTime() const ;
@@ -74,8 +80,13 @@
void setPosition( double pos[3]) ;
/** Sets dE/dx.
+ * DEPRECATED. renamed to setEDep()
+ */
+ void setdEdx( float dEdX ) ;
+
+ /** Sets EDep
*/
- void setdEdx( float dEdX ) ;
+ void setEDep( float e ) ;
/** Sets the time.
*/
@@ -100,7 +111,8 @@
protected:
int _cellID ;
double _pos[3] ;
- float _dEdx ;
+ //float _dEdx ; // DEPRECATED. renamed to _EDep
+ float _EDep ;
float _time ;
EVENT::MCParticle* _particle ;
float _p[3] ;
lcio/src/cpp/include/IMPL
diff -u -r1.13 -r1.14
--- TrackerHitImpl.h 1 Jun 2010 10:19:37 -0000 1.13
+++ TrackerHitImpl.h 2 Jun 2010 10:59:33 -0000 1.14
@@ -15,7 +15,7 @@
/** Implementation of the generic tracker hit.
*
* @author gaede
- * @version $Id: TrackerHitImpl.h,v 1.13 2010/06/01 10:19:37 engels Exp $
+ * @version $Id: TrackerHitImpl.h,v 1.14 2010/06/02 10:59:33 engels Exp $
*/
class TrackerHitImpl : public EVENT::TrackerHit , public AccessChecked {
@@ -39,12 +39,18 @@
virtual const EVENT::FloatVec & getCovMatrix() const ;
/** The dE/dx of the hit in [GeV/mm].
- *
- * DEPRECATED. use getCharge() instead.
- *
+ * DEPRECATED. renamed to getEDep()
*/
virtual float getdEdx() const ;
+ /** The deposited energy of the hit [GeV]
+ */
+ virtual float getEDep() const { return _EDep ; }
+
+ /** The error measured on EDep [GeV]
+ */
+ virtual float getEDepError() const { return _EDepError ; }
+
/** The time of the hit in [ns]. Is this needed ?
*/
virtual float getTime() const ;
@@ -61,14 +67,6 @@
*/
virtual int getType() const ;
- /** The charge of the hit.
- */
- virtual float getCharge() const { return _charge ; }
-
- /** The charge error
- */
- virtual float getChargeError() const { return _chargeError ; }
-
/** The quality bit flag of the hit.
*/
virtual int getQuality() const { return _quality ; }
@@ -89,10 +87,10 @@
void setPosition( double pos[3]) ;
void setCovMatrix( const EVENT::FloatVec& cov );
void setCovMatrix( float cov[TRKHITNCOVMATRIX] );
- //void setdEdx( float dedx ) ;
+ void setdEdx( float dedx ) ; // DEPRECATED. renamed to setEDep()
+ void setEDep( float e ) ;
+ void setEDepError( float e ) ;
void setTime( float t ) ;
- void setCharge( float charge ) ;
- void setChargeError( float error ) ;
void setQuality( int quality ) ;
void setQualityBit( int bit , bool val=true ) ;
@@ -102,10 +100,10 @@
int _type ;
double _pos[3] ;
EVENT::FloatVec _cov ;
- //float _dEdx ;
+ //float _dEdx ; // DEPRECATED. renamed to _EDep
+ float _EDep ;
+ float _EDepError ;
float _time ;
- float _charge ;
- float _chargeError ;
int _quality ;
EVENT::LCObjectVec _rawHits ;
lcio/src/cpp/src/CPPFORT
diff -u -r1.3 -r1.4
--- lcsth.cc 24 Mar 2006 13:36:43 -0000 1.3
+++ lcsth.cc 2 Jun 2010 10:59:33 -0000 1.4
@@ -42,11 +42,17 @@
return sth->getPathLength() ;
}
+// DEPRECATED. use lcsthgetedep
float lcsthgetdedx( PTRTYPE hit ){
SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
return sth->getdEdx() ;
}
+float lcsthgetedep( PTRTYPE hit ){
+ SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
+ return sth->getEDep() ;
+}
+
float lcsthgettime( PTRTYPE hit ){
SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
return sth->getTime() ;
@@ -86,12 +92,19 @@
return LCIO::SUCCESS ;
}
+// DEPRECATED. use lcsthsetedep()
int lcsthsetdedx( PTRTYPE hit, float dEdX ){
SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
sth->setdEdx( dEdX ) ;
return LCIO::SUCCESS ;
}
+int lcsthsetedep( PTRTYPE hit, float e ){
+ SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
+ sth->setEDep( e ) ;
+ return LCIO::SUCCESS ;
+}
+
int lcsthsettime( PTRTYPE hit, float t ){
SimTrackerHitImpl* sth = f2c_pointer<SimTrackerHitImpl,LCObject>( hit ) ;
sth->setTime( t ) ;
lcio/src/cpp/src/CPPFORT
diff -u -r1.8 -r1.9
--- lctrh.cc 1 Jun 2010 10:19:37 -0000 1.8
+++ lctrh.cc 2 Jun 2010 10:59:33 -0000 1.9
@@ -39,10 +39,20 @@
return LCIO::SUCCESS ;
}
+// DEPRECATED. use lctrhgetedep()
float lctrhgetdedx( PTRTYPE trhit ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- //return trh->getdEdx() ;
- return trh->getCharge() ;
+ return trh->getdEdx() ;
+}
+
+float lctrhgetedep( PTRTYPE trhit ) {
+ TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
+ return trh->getEDep() ;
+}
+
+float lctrhgetedeperr( PTRTYPE trhit ) {
+ TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
+ return trh->getEDepError() ;
}
float lctrhgettime( PTRTYPE trhit ) {
@@ -60,16 +70,6 @@
return trh->getType() ;
}
-float lctrhgetcharge( PTRTYPE trhit ) {
- TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- return trh->getCharge() ;
-}
-
-float lctrhgetchargeerr( PTRTYPE trhit ) {
- TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- return trh->getChargeError() ;
-}
-
int lctrhgetquality( PTRTYPE trhit ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
return trh->getQuality() ;
@@ -97,33 +97,34 @@
return LCIO::SUCCESS ;
}
-//int lctrhsetdedx( PTRTYPE trhit, float dedx) {
-// TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
-// trh->setdEdx( dedx ) ;
-// return LCIO::SUCCESS ;
-//}
+// DEPRECATED. use lctrhsetedep()
+int lctrhsetdedx( PTRTYPE trhit, float dedx) {
+ TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
+ trh->setdEdx( dedx ) ;
+ return LCIO::SUCCESS ;
+}
-int lctrhsettime( PTRTYPE trhit, float time) {
+int lctrhsetedep( PTRTYPE trhit, float e ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- trh->setTime( time ) ;
+ trh->setEDep( e ) ;
return LCIO::SUCCESS ;
}
-int lctrhsettype( PTRTYPE trhit, int type) {
+int lctrhsetedeperr( PTRTYPE trhit, float e ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- trh->setType( type ) ;
+ trh->setEDepError( e ) ;
return LCIO::SUCCESS ;
}
-int lctrhsetcharge( PTRTYPE trhit, float charge ) {
+int lctrhsettime( PTRTYPE trhit, float time) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- trh->setCharge( charge ) ;
+ trh->setTime( time ) ;
return LCIO::SUCCESS ;
}
-int lctrhsetchargeerr( PTRTYPE trhit, float error ) {
+int lctrhsettype( PTRTYPE trhit, int type) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
- trh->setChargeError( error ) ;
+ trh->setType( type ) ;
return LCIO::SUCCESS ;
}
lcio/src/cpp/src/IMPL
diff -u -r1.12 -r1.13
--- SimTrackerHitImpl.cc 5 Jun 2009 09:24:39 -0000 1.12
+++ SimTrackerHitImpl.cc 2 Jun 2010 10:59:33 -0000 1.13
@@ -7,7 +7,8 @@
SimTrackerHitImpl::SimTrackerHitImpl() :
_cellID(0),
- _dEdx(0),
+ //_dEdx(0),
+ _EDep(0),
_time(0),
_particle(0),
_pathLength(0){
@@ -26,7 +27,13 @@
const double * SimTrackerHitImpl::getPosition() const { return _pos ; }
- float SimTrackerHitImpl::getdEdx() const { return _dEdx ; }
+ // DEPRECATED. use getEDep()
+ float SimTrackerHitImpl::getdEdx() const {
+ //return _dEdx ;
+ return getEDep() ;
+ }
+
+ float SimTrackerHitImpl::getEDep() const { return _EDep ; }
float SimTrackerHitImpl::getTime() const { return _time ; }
@@ -48,9 +55,16 @@
_pos[2] = pos[2] ;
}
+ // DEPRECATED. use setEDep()
void SimTrackerHitImpl::setdEdx( float dedx ) {
- checkAccess("SimTrackerHitImpl::setdEdx") ;
- _dEdx = dedx ;
+ //checkAccess("SimTrackerHitImpl::setdEdx") ;
+ //_dEdx = dedx ;
+ SimTrackerHitImpl::setEDep( dedx ) ;
+ }
+
+ void SimTrackerHitImpl::setEDep( float e ) {
+ checkAccess("SimTrackerHitImpl::setEDep") ;
+ _EDep = e ;
}
void SimTrackerHitImpl::setTime( float t ) {
lcio/src/cpp/src/IMPL
diff -u -r1.12 -r1.13
--- TrackerHitImpl.cc 1 Jun 2010 10:19:37 -0000 1.12
+++ TrackerHitImpl.cc 2 Jun 2010 10:59:33 -0000 1.13
@@ -8,9 +8,9 @@
TrackerHitImpl::TrackerHitImpl() :
_type(0),
//_dEdx(0),
+ _EDep(0),
+ _EDepError(0),
_time(0),
- _charge(0),
- _chargeError(0),
_quality(0) {
_pos[0] = 0. ;
_pos[1] = 0. ;
@@ -31,9 +31,10 @@
return _cov ;
}
+ // DEPRECATED. use getEDep()
float TrackerHitImpl::getdEdx() const {
//return _dEdx ;
- return getCharge();
+ return getEDep();
}
float TrackerHitImpl::getTime() const { return _time ; }
@@ -75,24 +76,26 @@
_pos[2] = pos[2] ;
}
- //void TrackerHitImpl::setdEdx( float dedx ) {
- // checkAccess("TrackerHitImpl::setdEdx") ;
- // _dEdx = dedx ;
- //}
+ // DEPRECATED. use setEDep()
+ void TrackerHitImpl::setdEdx( float dedx ) {
+ //checkAccess("TrackerHitImpl::setdEdx") ;
+ //_dEdx = dedx ;
+ setEDep( dedx ) ;
+ }
- void TrackerHitImpl::setTime( float t ) {
- checkAccess("TrackerHitImpl::setTime") ;
- _time = t ;
+ void TrackerHitImpl::setEDep( float e ) {
+ checkAccess("TrackerHitImpl::setEDep") ;
+ _EDep = e ;
}
- void TrackerHitImpl::setCharge( float charge ) {
- checkAccess("TrackerHitImpl::setCharge") ;
- _charge = charge ;
+ void TrackerHitImpl::setEDepError( float e ) {
+ checkAccess("TrackerHitImpl::setEDepError") ;
+ _EDepError = e ;
}
- void TrackerHitImpl::setChargeError( float error ) {
- checkAccess("TrackerHitImpl::setChargeError") ;
- _chargeError = error ;
+ void TrackerHitImpl::setTime( float t ) {
+ checkAccess("TrackerHitImpl::setTime") ;
+ _time = t ;
}
void TrackerHitImpl::setQuality( int quality ) {
lcio/src/cpp/src/SIO
diff -u -r1.11 -r1.12
--- SIOSimTrackHitHandler.cc 8 Mar 2006 09:57:28 -0000 1.11
+++ SIOSimTrackHitHandler.cc 2 Jun 2010 10:59:33 -0000 1.12
@@ -30,7 +30,9 @@
SIO_DATA( stream , &(hit->_cellID) , 1 ) ;
SIO_DATA( stream , hit->_pos , 3 ) ;
- SIO_DATA( stream , &(hit->_dEdx) , 1 ) ;
+ //SIO_DATA( stream , &(hit->_dEdx) , 1 ) ;
+ SIO_DATA( stream , &(hit->_EDep) , 1 ) ;
+
SIO_DATA( stream , &(hit->_time) , 1 ) ;
SIO_PNTR( stream , &(hit->_particle) ) ;
@@ -67,7 +69,7 @@
// we have to cast away the constness
double* pos = const_cast<double*> ( hit->getPosition() ) ;
SIO_DATA( stream, pos , 3 ) ;
- LCSIO_WRITE( stream, hit->getdEdx() ) ;
+ LCSIO_WRITE( stream, hit->getEDep() ) ;
LCSIO_WRITE( stream, hit->getTime() ) ;
const MCParticle* part = hit->getMCParticle() ;
lcio/src/cpp/src/SIO
diff -u -r1.12 -r1.13
--- SIOTrackerHitHandler.cc 1 Jun 2010 10:19:37 -0000 1.12
+++ SIOTrackerHitHandler.cc 2 Jun 2010 10:59:33 -0000 1.13
@@ -36,18 +36,14 @@
hit->setCovMatrix( cov ) ;
//SIO_DATA( stream , &(hit->_dEdx) , 1 ) ;
- if( _vers < SIO_VERSION_ENCODE( 1, 13 ) ){
- // JE: if reading older files store dEdx as charge
- SIO_DATA( stream , &(hit->_charge) , 1 ) ;
- }
-
- SIO_DATA( stream , &(hit->_time) , 1 ) ;
+ SIO_DATA( stream , &(hit->_EDep) , 1 ) ;
if( _vers > SIO_VERSION_ENCODE( 1, 12 ) ){
- SIO_DATA( stream , &(hit->_charge) , 1 ) ;
- SIO_DATA( stream , &(hit->_chargeError) , 1 ) ;
+ SIO_DATA( stream , &(hit->_EDepError) , 1 ) ;
}
+ SIO_DATA( stream , &(hit->_time) , 1 ) ;
+
if( _vers > SIO_VERSION_ENCODE( 1, 11 ) )
SIO_DATA( stream , &(hit->_quality) , 1 ) ;
@@ -91,9 +87,9 @@
}
//LCSIO_WRITE( stream, hit->getdEdx() ) ;
+ LCSIO_WRITE( stream, hit->getEDep() ) ;
+ LCSIO_WRITE( stream, hit->getEDepError() ) ;
LCSIO_WRITE( stream, hit->getTime() ) ;
- LCSIO_WRITE( stream, hit->getCharge() ) ;
- LCSIO_WRITE( stream, hit->getChargeError() ) ;
LCSIO_WRITE( stream, hit->getQuality() ) ;
// const LCObject* raw = hit->getRawDataHit() ;
lcio/src/cpp/src/TESTS
diff -u -r1.1 -r1.2
--- test_trackerhit.cc 30 Apr 2010 15:28:25 -0000 1.1
+++ test_trackerhit.cc 2 Jun 2010 10:59:33 -0000 1.2
@@ -58,8 +58,8 @@
for(int j=0;j<NHITS;j++){
TrackerHitImpl* trkHit = new TrackerHitImpl ;
- trkHit->setCharge( i*j*117. ) ;
- trkHit->setChargeError( (i+j)*.3 ) ;
+ trkHit->setEDep( i*j*117. ) ;
+ trkHit->setEDepError( (i+j)*.3 ) ;
double pos[3] = { i, j, i*j } ;
trkHit->setPosition( pos ) ;
trkHits->addElement( trkHit ) ;
@@ -99,10 +99,10 @@
TrackerHit* trkHit = dynamic_cast<TrackerHit*>(trkHits->getElementAt(j)) ;
- MYTEST( trkHit->getCharge() , i*j*117. , "charge" ) ;
+ MYTEST( trkHit->getEDep() , i*j*117. , "EDep" ) ;
// remove float converstion and check what happens ;)
- MYTEST( trkHit->getChargeError() , float((i+j)*.3) , "charge error" ) ;
- //MYTEST( trkHit->getChargeError() , (i+j)*.3 , "charge error" ) ;
+ MYTEST( trkHit->getEDepError() , float((i+j)*.3) , "EDepError" ) ;
+ //MYTEST( trkHit->getEDepError() , (i+j)*.3 , "EDepError" ) ;
const double* pos = trkHit->getPosition() ;
lcio/src/cpp/src/UTIL
diff -u -r1.66 -r1.67
--- LCTOOLS.cc 1 Jun 2010 10:19:37 -0000 1.66
+++ LCTOOLS.cc 2 Jun 2010 10:59:33 -0000 1.67
@@ -358,7 +358,7 @@
int nPrint = nHits > MAX_HITS ? MAX_HITS : nHits ;
std::cout << endl
- << " cellID[indices] | position (x,y,z) | dEdx | time | PDG of MCParticle" ;
+ << " cellID[indices] | position (x,y,z) | EDep | time | PDG of MCParticle" ;
if( pStored )
std::cout << " | (px, py, pz) | pathLength " ;
@@ -385,7 +385,7 @@
<< hit->getPosition()[0] << ", "
<< hit->getPosition()[1] << ", "
<< hit->getPosition()[2] << ") | "
- << hit->getdEdx () << " | "
+ << hit->getEDep () << " | "
<< hit->getTime () << " | "
<< pdgid ;
@@ -430,7 +430,7 @@
int nPrint = nHits > MAX_HITS ? MAX_HITS : nHits ;
std::cout << endl
- << " [ id ] | position (x,y,z) | time |type | charge | charge_err"
+ << " [ id ] | position (x,y,z) | time |type | EDep | EDepError"
<< endl
<< endl ;
@@ -452,8 +452,8 @@
//, hit->getdEdx()
, hit->getTime()
, hit->getType()
- , hit->getCharge()
- , hit->getChargeError()
+ , hit->getEDep()
+ , hit->getEDepError()
) ;
const LCObjectVec& rawHits = hit->getRawHits() ;
lcio/src/f77
diff -u -r1.42 -r1.43
--- lciof77api.inc 1 Jun 2010 10:19:37 -0000 1.42
+++ lciof77api.inc 2 Jun 2010 10:59:33 -0000 1.43
@@ -12,7 +12,7 @@
* H. Vogt
* 05/06/2004 (reconstruction part added)
*
-* $Id: lciof77api.inc,v 1.42 2010/06/01 10:19:37 engels Exp $
+* $Id: lciof77api.inc,v 1.43 2010/06/02 10:59:33 engels Exp $
***************************************************
#include "lciof77pointer.inc"
@@ -127,10 +127,11 @@
c-----the SimTrackerHit interface
PTRTYPE lcsthcreate, lcsthgetmcparticle
integer lcsthdelete, lcsthgetcellid
- real lcsthgetdedx, lcsthgettime
+ real lcsthgetdedx, lcsthgetedep, lcsthgettime
double precision lcsthgetposition
real lcsthgetmomentum, lcsthgetpathlength
- integer lcsthsetcellid, lcsthsetposition, lcsthsetdedx
+ integer lcsthsetcellid, lcsthsetposition, lcsthsetdedx
+ integer lcsthsetedep
integer lcsthsettime, lcsthsetmcparticle, lcsthsetmomentum
integer lcsthsetmomentumxyz, lcsthsetpathlength
@@ -233,11 +234,10 @@
PTRTYPE lctrhcreate, lctrhgetrawhits
integer lctrhdelete, lctrhid, lctrhgetposition, lctrhgetcovmatrix
integer lctrhgettype, lctrhgetquality
- real lctrhgetdedx, lctrhgettime
- real lctrhgetcharge, lctrhgetchargeerr
+ real lctrhgetdedx, lctrhgetedep, lctrhgetedeperr, lctrhgettime
integer lctrhsetposition, lctrhsetcovmatrix
integer lctrhsettime, lctrhsettype, lctrhsetquality
- integer lctrhsetcharge, lctrhsetchargeerr
+ integer lctrhsetdedx, lctrhsetedep, lctrhsetedeperr
integer lctrhaddrawhit
c-----the Track interface
lcio/src/f77
diff -u -r1.24 -r1.25
--- recjob.F 1 Jun 2010 10:19:37 -0000 1.24
+++ recjob.F 2 Jun 2010 10:59:34 -0000 1.25
@@ -204,8 +204,7 @@
do i = 1, ntpchits
trhitp = lctrhcreate ()
tpchit = lccolgetelementat ( tpchitcol, i)
-ccc status = lctrhsetdedx ( trhitp, lctphgcharge ( tpchit ) )
- status = lctrhsetcharge ( trhitp, lctphgcharge ( tpchit ) )
+ status = lctrhsetdedx ( trhitp, lctphgcharge ( tpchit ) )
status = lctrhsettime ( trhitp, lctphgettime ( tpchit ) )
cellid = lctphgetcellid ( tpchit )
dpos(1) = iand ( cellid, 'ff'x )
lcio/src/java/hep/lcio/implementation/event
diff -u -r1.10 -r1.11
--- ISimTrackerHit.java 20 Mar 2006 20:05:46 -0000 1.10
+++ ISimTrackerHit.java 2 Jun 2010 10:59:34 -0000 1.11
@@ -7,13 +7,14 @@
/**
* A default implementation of SimTrackerHit
* @author Tony Johnson
- * @version $Id: ISimTrackerHit.java,v 1.10 2006/03/20 20:05:46 tonyj Exp $
+ * @version $Id: ISimTrackerHit.java,v 1.11 2010/06/02 10:59:34 engels Exp $
*/
public class ISimTrackerHit extends ILCObject implements SimTrackerHit
{
protected Object particle;
protected double[] position = new double[3];
- protected float dEdx;
+ //protected float dEdx; // DEPRECATED. renamed to EDep
+ protected float EDep;
protected float time;
protected int cellID;
protected float[] momentum = new float[3] ;
@@ -66,18 +67,33 @@
return time;
}
+ // DEPRECATED. renamed to getEDep()
public float getdEdx()
{
- return dEdx;
+ //return dEdx;
+ return getEDep();
}
+ // DEPRECATED. renamed to setEDep()
public void setdEdx(float dEdx)
{
- checkAccess();
- this.dEdx = dEdx;
+ //checkAccess();
+ //this.dEdx = dEdx;
+ setEDep( dEdx );
}
- public float[] getMomentum()
+ public float getEDep()
+ {
+ return EDep;
+ }
+
+ public void setEDep(float e)
+ {
+ checkAccess();
+ this.EDep = e;
+ }
+
+ public float[] getMomentum()
{
return momentum;
}
lcio/src/java/hep/lcio/implementation/event
diff -u -r1.11 -r1.12
--- ITrackerHit.java 1 Jun 2010 10:19:37 -0000 1.11
+++ ITrackerHit.java 2 Jun 2010 10:59:34 -0000 1.12
@@ -7,17 +7,16 @@
/**
* @author Tony Johnson
- * @version $Id: ITrackerHit.java,v 1.11 2010/06/01 10:19:37 engels Exp $
+ * @version $Id: ITrackerHit.java,v 1.12 2010/06/02 10:59:34 engels Exp $
*/
public class ITrackerHit extends ILCObject implements TrackerHit
{
protected double[] position = new double[3];
protected float[] covMatrix = new float[6];
- // deprecated
- //protected float dEdx;
+ //protected float dEdx; // DEPRECATED. renamed to EDep
+ protected float EDep;
+ protected float EDepError;
protected float time;
- protected float charge;
- protected float chargeError;
protected int type;
protected int quality;
protected List rawHits = new ArrayList() ;
@@ -46,51 +45,54 @@
this.covMatrix = matrix;
}
+ // DEPRECATED. renamed to getEDep()
public float getdEdx()
{
//return dEdx;
- return getCharge();
+ return getEDep();
}
- // deprecated
- //public void setdEdx(float dEdx)
- //{
- // checkAccess();
- // this.dEdx = dEdx;
- //}
-
- public float getTime()
+
+ // DEPRECATED. renamed to setEDep()
+ public void setdEdx(float dEdx)
{
- return time;
+ //checkAccess();
+ //this.dEdx = dEdx;
+ setEDep( dEdx );
}
- public void setTime(float time)
+ public float getEDep()
+ {
+ return EDep;
+ }
+
+ public void setEDep(float e)
{
checkAccess();
- this.time = time;
+ this.EDep = e;
}
-
- public float getCharge()
+
+ public float getEDepError()
{
- return charge;
+ return EDepError;
}
- public void setCharge(float charge)
+ public void setEDepError(float e)
{
checkAccess();
- this.charge = charge;
+ this.EDepError = e;
}
- public float getChargeError()
+ public float getTime()
{
- return chargeError;
+ return time;
}
-
- public void setChargeError(float error)
+
+ public void setTime(float time)
{
checkAccess();
- this.chargeError = error;
+ this.time = time;
}
-
+
public int getQuality()
{
return quality;
lcio/src/java/hep/lcio/implementation/sio
diff -u -r1.15 -r1.16
--- SIOSimTrackerHit.java 7 Nov 2007 20:46:23 -0000 1.15
+++ SIOSimTrackerHit.java 2 Jun 2010 10:59:34 -0000 1.16
@@ -17,7 +17,7 @@
/**
*
* @author Tony Johnson
- * @version $Id: SIOSimTrackerHit.java,v 1.15 2007/11/07 20:46:23 jeremy Exp $
+ * @version $Id: SIOSimTrackerHit.java,v 1.16 2010/06/02 10:59:34 engels Exp $
*/
class SIOSimTrackerHit extends ISimTrackerHit
{
@@ -28,7 +28,8 @@
position[0] = in.readDouble();
position[1] = in.readDouble();
position[2] = in.readDouble();
- dEdx = in.readFloat();
+ //dEdx = in.readFloat();
+ EDep = in.readFloat();
time = in.readFloat();
particle = in.readPntr();
@@ -66,7 +67,8 @@
out.writeDouble(pos[0]);
out.writeDouble(pos[1]);
out.writeDouble(pos[2]);
- out.writeFloat(hit.getdEdx());
+ //out.writeFloat(hit.getdEdx());
+ out.writeFloat(hit.getEDep());
out.writeFloat(hit.getTime());
out.writePntr(hit.getMCParticle());
if ((flags & (1 << LCIO.THBIT_MOMENTUM)) != 0)
@@ -88,7 +90,8 @@
out.writeDouble(position[0]);
out.writeDouble(position[1]);
out.writeDouble(position[2]);
- out.writeFloat(dEdx);
+ //out.writeFloat(dEdx);
+ out.writeFloat(EDep);
out.writeFloat(time);
out.writePntr(getMCParticle());
if ((flags & (1 << LCIO.THBIT_MOMENTUM)) != 0)
lcio/src/java/hep/lcio/implementation/sio
diff -u -r1.15 -r1.16
--- SIOTrackerHit.java 1 Jun 2010 10:19:37 -0000 1.15
+++ SIOTrackerHit.java 2 Jun 2010 10:59:34 -0000 1.16
@@ -16,7 +16,7 @@
/**
*
* @author Tony Johnson
- * @version $Id: SIOTrackerHit.java,v 1.15 2010/06/01 10:19:37 engels Exp $
+ * @version $Id: SIOTrackerHit.java,v 1.16 2010/06/02 10:59:34 engels Exp $
*/
class SIOTrackerHit extends ITrackerHit
{
@@ -30,19 +30,14 @@
for (int i = 0; i < 6; i++)
covMatrix[i] = in.readFloat();
//dEdx = in.readFloat();
- if( SIOVersion.encode(major,minor) < SIOVersion.encode(1,13)){
- // if reading older files store dEdx as charge
- charge = in.readFloat();
- }
- time = in.readFloat();
-
- charge = 0 ;
- chargeError = 0 ;
+ EDep = in.readFloat();
+ EDepError = 0 ;
if( SIOVersion.encode(major,minor) > SIOVersion.encode(1,12)){
- charge = in.readFloat();
- chargeError = in.readFloat();
+ EDepError = in.readFloat();
}
+ time = in.readFloat();
+
quality = 0 ;
if( SIOVersion.encode(major,minor) > SIOVersion.encode(1,11))
quality = in.readInt();
@@ -94,9 +89,9 @@
for (int i = 0; i < 6; i++)
out.writeFloat(matrix[i]);
//out.writeFloat(hit.getdEdx());
+ out.writeFloat(hit.getEDep());
+ out.writeFloat(hit.getEDepError());
out.writeFloat(hit.getTime());
- out.writeFloat(hit.getCharge());
- out.writeFloat(hit.getChargeError());
out.writeInt(hit.getQuality());
List rawHits = hit.getRawHits() ;
@@ -118,9 +113,9 @@
for (int i = 0; i < 6; i++)
out.writeFloat(covMatrix[i]);
//out.writeFloat(dEdx);
+ out.writeFloat(EDep);
+ out.writeFloat(EDepError);
out.writeFloat(time);
- out.writeFloat(charge);
- out.writeFloat(chargeError);
out.writeInt(quality);
out.writeInt( rawHits.size()) ;
lcio/src/java/hep/lcio/util
diff -u -r1.13 -r1.14
--- Printer.java 20 May 2010 20:43:47 -0000 1.13
+++ Printer.java 2 Jun 2010 10:59:34 -0000 1.14
@@ -356,7 +356,8 @@
boolean pstored = ((flag & (1 << LCIO.THBIT_MOMENTUM)) != 0);
- ps.println(" [ id ] | cellID[indices] | position (x,y,z) | dEdx | time | PDG of MCParticle");
+ //ps.println(" [ id ] | cellID[indices] | position (x,y,z) | dEdx | time | PDG of MCParticle");
+ ps.println(" [ id ] | cellID[indices] | position (x,y,z) | EDep | time | PDG of MCParticle");
if (pstored)
ps.println(" | (px, py, pz) | pathLength ");
@@ -380,7 +381,8 @@
Double.valueOf(hit.getPosition()[0]),
Double.valueOf(hit.getPosition()[1]),
Double.valueOf(hit.getPosition()[2]),
- Float.valueOf(hit.getdEdx()),
+ //Float.valueOf(hit.getdEdx()),
+ Float.valueOf(hit.getEDep()),
Float.valueOf(hit.getTime()),
Integer.valueOf(pdgid)
);
@@ -462,19 +464,23 @@
{
void print(LCCollection coll, int nprint)
{
- ps.println(" [id] | position (x,y,z) | dEdx | time | type");
+ //ps.println(" [id] | position (x,y,z) | dEdx | time | type");
+ ps.println(" [id] | position (x,y,z) | time | type | EDep | EDepError");
for(int i=0 ; i<nprint; i++)
{
TrackerHit hit = (TrackerHit)coll.getElementAt(i);
- ps.format(" [%08x] | (%5.3e,%5.3e,%5.3e) | %5.3e | %5.3e | [%d] \n",
+ //ps.format(" [%08x] | (%5.3e,%5.3e,%5.3e) | %5.3e | %5.3e | [%d] \n",
+ ps.format(" [%08x] | (%5.3e,%5.3e,%5.3e) | %5.3e | %5.3e | [%d] | %4.3e | %4.3e \n",
Integer.valueOf(hit.hashCode()),
Double.valueOf(hit.getPosition()[0]),
Double.valueOf(hit.getPosition()[1]),
Double.valueOf(hit.getPosition()[2]),
- Double.valueOf(hit.getdEdx()),
+ //Double.valueOf(hit.getdEdx()),
Double.valueOf(hit.getTime()),
- Integer.valueOf(hit.getType())
+ Integer.valueOf(hit.getType()),
+ Double.valueOf(hit.getEDep()),
+ Double.valueOf(hit.getEDepError())
);
}
}
@@ -1113,7 +1119,8 @@
{
void print(LCCollection coll, int nprint)
{
- ps.println(" [ id ] | [cellID0] | [cellID1] | time | charge | quality | corr.Data ");
+ //ps.println(" [ id ] | [cellID0] | [cellID1] | time | charge | quality | corr.Data ");
+ ps.println(" [ id ] | [cellID0] | [cellID1] | time | charge | quality | corr.Data | cov(c,c), cov(t,c), cov(t,t)");
for (int i=0; i<nprint; i++)
{
@@ -1130,7 +1137,13 @@
TrackerData corr = hit.getTrackerData();
ps.format("[%08x] ", Integer.valueOf(corr != null ? corr.hashCode() : 0));
- ps.println();
+
+ // Print covariance matrix.
+ ps.print(" cov( cc,tc,tt) : (");
+ for(int j=0; j<hit.getCovMatrix().length; j++){
+ ps.format("%4.2e, ", Double.valueOf(hit.getCovMatrix()[j])) ;
+ }
+ ps.println(")");
}
}
lcio/src/latex/manual
diff -u -r1.22 -r1.23
--- f77summary.tex 1 Jun 2010 10:19:37 -0000 1.22
+++ f77summary.tex 2 Jun 2010 10:59:34 -0000 1.23
@@ -166,6 +166,7 @@
setCellID -> status = lcsthsetcellid( pthit , icellid )
setPosition -> status = lcsthsetposition( pthit , dposv )
setdEdx -> status = lcsthsetdedx( pthit , fdedx )
+setEDep -> status = lcsthsetedep( pthit , fedep )
setTime -> status = lcsthsettime( pthit , ftime )
setMCParticle -> status = lcsthsetmcparticle( pthit , pmcp )
setMomentum -> status = lcsthsetmomentum( pthit , fpv )
@@ -177,6 +178,7 @@
getMomentum -> fpv(i) = lcsthgetmomentum( pthit , i ) (i=1,2,3)
getPathLength -> pathl = lcsthgetpathlength ( pthit )
getdEdx -> fdedx = lcsthgetdedx( pthit )
+getEDep -> fedep = lcsthgetedep( pthit )
getTime -> ftime = lcsthgettime( pthit )
getMCParticle -> pmcp = lcsthgetmcparticle( pthit )
@@ -250,10 +252,11 @@
delete -> status = lctrhdelete( ptrhit )
setPosition -> status = lctrhsetposition( ptrhit, dposv )
setCovMatrix -> status = lctrhsetcovmatrix( ptrhit, covmxv )
+setdEdx -> status = lctrhsetdedx( ptrhit , dedx )
+setEDep -> status = lctrhsetedep( ptrhit , edep )
+setEDepError -> status = lctrhsetedeperr( ptrhit , error )
setTime -> status = lctrhsettime( ptrhit, time )
setType -> status = lctrhsettype( ptrhit, itype )
-setCharge -> status = lctrhsetcharge( ptrhit , charge )
-setChargeError -> status = lctrhsetchargeerr( ptrhit , error )
setQuality -> status = lctrhsetquality( ptrhit , iquality )
addRawHit -> status = lctrhaddrawhit( ptrhit, prawh )
@@ -261,10 +264,10 @@
getPosition -> status = lctrhgetposition( ptrhit, dposv )
getCovMatrix -> status = lctrhsetcovmatrix( ptrhit, covmxv )
getdEdx -> dedx = lctrhgetdedx( ptrhit )
+getEDep -> edep = lctrhgetedep( ptrhit )
+getEDepError -> edeperr = lctrhgetedeperr( ptrhit )
getTime -> time = lctrhgettime( ptrhit )
getType -> itype = lctrhgettype( ptrhit )
-getCharge -> charge = lctrhgetcharge( ptrhit )
-getChargeError -> chargeerr= lctrhgetchargeerr( ptrhit )
getQuality -> iquality= lctrhgetquality( ptrhit )
getRawHits -> prawhv = lctrhgetrawhits( ptrhit )
CVSspam 0.2.8
