11 modified files
lcio/doc
diff -u -r1.64 -r1.65
--- lcio.xml 13 Dec 2008 13:13:50 -0000 1.64
+++ lcio.xml 22 Jul 2009 16:03:35 -0000 1.65
@@ -245,6 +245,7 @@
<data type="float[6]" name="covariance">Covariance Matrix of position (x,y,z)</data>
<data type="float" name="dedx"></data>
<data type="float" name="time"></data>
+ <data type="int" name="quality">quality flag word</data>
<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.11 -r1.12
--- TrackerHit.aid 11 Oct 2006 13:27:29 -0000 1.11
+++ TrackerHit.aid 22 Jul 2009 16:03:35 -0000 1.12
@@ -11,7 +11,7 @@
/** A generic tracker hit to be used by pattern recognition.
*
* @author gaede
- * @version $Id: TrackerHit.aid,v 1.11 2006/10/11 13:27:29 gaede Exp $
+ * @version $Id: TrackerHit.aid,v 1.12 2009/07/22 16:03:35 engels Exp $
*/
public interface TrackerHit extends LCObject {
@@ -53,6 +53,8 @@
*/
public int getType() const ;
+ /** The quality bit flag of the hit */
+ public int getQuality() const ;
/** The raw data hits.
* Check getType() to get actual data type.
lcio/src/cpp/include/CPPFORT
diff -u -r1.6 -r1.7
--- lctrh.h 15 Apr 2005 08:37:35 -0000 1.6
+++ lctrh.h 22 Jul 2009 16:03:35 -0000 1.7
@@ -1,7 +1,7 @@
/**Header file for the f77-wrapper functions of the Track Class.
*
* @author H. Vogt
- * @version $Id: lctrh.h,v 1.6 2005/04/15 08:37:35 gaede Exp $
+ * @version $Id: lctrh.h,v 1.7 2009/07/22 16:03:35 engels Exp $
*/
#include "cfortran.h"
#include "cpointer.h"
@@ -19,6 +19,7 @@
float lctrhgettime( PTRTYPE trh ) ;
//char* lctrhgettype( PTRTYPE trh ) ;
int lctrhgettype( PTRTYPE trh ) ;
+int lctrhgetquality( PTRTYPE trh ) ;
PTRTYPE lctrhgetrawhits( PTRTYPE trh ) ;
@@ -27,6 +28,7 @@
int lctrhsetdedx( PTRTYPE trh, float dedx ) ;
int lctrhsettime( PTRTYPE trh, float time ) ;
int lctrhsettype( PTRTYPE trh, int type ) ;
+int lctrhsetquality( PTRTYPE trh, int q );
int lctrhaddrawhit( PTRTYPE trh, PTRTYPE rawhit ) ;
@@ -43,13 +45,15 @@
FCALLSCFUN1(FLOAT, lctrhgettime, LCTRHGETTIME, lctrhgettime, CFORTRANPNTR)
//FCALLSCFUN1(STRING, lctrhgettype, LCTRHGETTYPE, lctrhgettype, CFORTRANPNTR )
FCALLSCFUN1(INT, lctrhgettype, LCTRHGETTYPE, lctrhgettype, 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, lctrhsettime, LCTRHSETTIME, lctrhsettime, CFORTRANPNTR, FLOAT)
-FCALLSCFUN2(INT, lctrhsettype, LCTRHSETTYPE, lctrhsettype, CFORTRANPNTR, INT )
+FCALLSCFUN2(INT, lctrhsettype, LCTRHSETTYPE, lctrhsettype, CFORTRANPNTR, INT )
+FCALLSCFUN2(INT, lctrhsetquality, LCTRHSETQUALITY, lctrhsetquality, CFORTRANPNTR, INT )
FCALLSCFUN2(INT, lctrhaddrawhit, LCTRHADDRAWHIT, lctrhaddrawhit, CFORTRANPNTR, CFORTRANPNTR)
}
lcio/src/cpp/include/IMPL
diff -u -r1.10 -r1.11
--- TrackerHitImpl.h 4 Aug 2006 16:52:46 -0000 1.10
+++ TrackerHitImpl.h 22 Jul 2009 16:03:35 -0000 1.11
@@ -15,7 +15,7 @@
/** Implementation of the generic tracker hit.
*
* @author gaede
- * @version $Id: TrackerHitImpl.h,v 1.10 2006/08/04 16:52:46 gaede Exp $
+ * @version $Id: TrackerHitImpl.h,v 1.11 2009/07/22 16:03:35 engels Exp $
*/
class TrackerHitImpl : public EVENT::TrackerHit , public AccessChecked {
@@ -58,6 +58,9 @@
*/
virtual int getType() const ;
+ /** The quality bit flag of the hit.
+ */
+ virtual int getQuality() const { return _quality ; }
/** The raw data hits.
* Check getType() to get actual data type.
@@ -77,7 +80,8 @@
void setCovMatrix( float cov[TRKHITNCOVMATRIX] );
void setdEdx( float dedx ) ;
void setTime( float t ) ;
-
+ void setQuality( int quality ) ;
+ void setQualityBit( int bit , bool val=true ) ;
protected:
@@ -87,6 +91,7 @@
EVENT::FloatVec _cov ;
float _dEdx ;
float _time ;
+ int _quality ;
EVENT::LCObjectVec _rawHits ;
lcio/src/cpp/src/CPPFORT
diff -u -r1.5 -r1.6
--- lctrh.cc 21 Sep 2004 16:30:39 -0000 1.5
+++ lctrh.cc 22 Jul 2009 16:03:35 -0000 1.6
@@ -59,6 +59,11 @@
return trh->getType() ;
}
+int lctrhgetquality( PTRTYPE trhit ) {
+ TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
+ return trh->getQuality() ;
+}
+
PTRTYPE lctrhgetrawhits( PTRTYPE trhit ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
// const TPCHit& hit = trh->getRawHits();
@@ -99,6 +104,12 @@
return LCIO::SUCCESS ;
}
+int lctrhsetquality( PTRTYPE trhit, int q) {
+ TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
+ trh->setQuality( q ) ;
+ return LCIO::SUCCESS ;
+}
+
int lctrhaddrawhit( PTRTYPE trhit, PTRTYPE rawhit ) {
TrackerHitImpl* trh = f2c_pointer<TrackerHitImpl,LCObject>( trhit ) ;
LCObject* hit = f2c_pointer<LCObject,LCObject>( rawhit ) ;
lcio/src/cpp/src/IMPL
diff -u -r1.9 -r1.10
--- TrackerHitImpl.cc 15 Apr 2005 08:37:47 -0000 1.9
+++ TrackerHitImpl.cc 22 Jul 2009 16:03:35 -0000 1.10
@@ -8,7 +8,8 @@
TrackerHitImpl::TrackerHitImpl() :
_type(0),
_dEdx(0),
- _time(0) {
+ _time(0),
+ _quality(0) {
_pos[0] = 0. ;
_pos[1] = 0. ;
_pos[2] = 0. ;
@@ -79,6 +80,20 @@
_time = t ;
}
+ void TrackerHitImpl::setQuality( int quality ) {
+ checkAccess("TrackerHitImpl::setQuality") ;
+ _quality = quality ;
+ }
+
+ void TrackerHitImpl::setQualityBit( int bit , bool val ) {
+ checkAccess("TrackerHitImpl::setQuality") ;
+
+ if( val )
+ _quality |= ( 1 << bit ) ;
+ else
+ _quality &= ~( 1 << bit ) ;
+ }
+
void TrackerHitImpl::setCovMatrix( const FloatVec& cov ){
checkAccess("TrackerHitImpl::setCovMatrix") ;
for(int i=0;i<TRKHITNCOVMATRIX;i++){
lcio/src/cpp/src/SIO
diff -u -r1.8 -r1.9
--- SIOTrackerHitHandler.cc 15 Apr 2005 08:37:50 -0000 1.8
+++ SIOTrackerHitHandler.cc 22 Jul 2009 16:03:36 -0000 1.9
@@ -37,6 +37,7 @@
SIO_DATA( stream , &(hit->_dEdx) , 1 ) ;
SIO_DATA( stream , &(hit->_time) , 1 ) ;
+ SIO_DATA( stream , &(hit->_quality) , 1 ) ;
// rawHits
@@ -79,6 +80,7 @@
LCSIO_WRITE( stream, hit->getdEdx() ) ;
LCSIO_WRITE( stream, hit->getTime() ) ;
+ LCSIO_WRITE( stream, hit->getQuality() ) ;
// const LCObject* raw = hit->getRawDataHit() ;
// SIO_PNTR( stream , &raw ) ;
lcio/src/f77
diff -u -r1.39 -r1.40
--- lciof77api.inc 4 Jun 2008 17:37:16 -0000 1.39
+++ lciof77api.inc 22 Jul 2009 16:03:36 -0000 1.40
@@ -12,7 +12,7 @@
* H. Vogt
* 05/06/2004 (reconstruction part added)
*
-* $Id: lciof77api.inc,v 1.39 2008/06/04 17:37:16 engels Exp $
+* $Id: lciof77api.inc,v 1.40 2009/07/22 16:03:36 engels Exp $
***************************************************
#include "lciof77pointer.inc"
@@ -232,10 +232,11 @@
c-----the TrackerHit interface
PTRTYPE lctrhcreate, lctrhgetrawhits
integer lctrhdelete, lctrhid, lctrhgetposition, lctrhgetcovmatrix
- integer lctrhgettype
+ integer lctrhgettype, lctrhgetquality
real lctrhgetdedx, lctrhgettime
integer lctrhsetposition, lctrhsetcovmatrix, lctrhsetdedx
- integer lctrhsettime, lctrhsettype, lctrhaddrawhit
+ integer lctrhsettime, lctrhsettype, lctrhsetquality
+ integer lctrhaddrawhit
c-----the Track interface
PTRTYPE lctrkcreate, lctrkgettracks, lctrkgettrackerhits
lcio/src/java/hep/lcio/implementation/event
diff -u -r1.8 -r1.9
--- ITrackerHit.java 24 Sep 2004 13:21:22 -0000 1.8
+++ ITrackerHit.java 22 Jul 2009 16:03:36 -0000 1.9
@@ -7,7 +7,7 @@
/**
* @author Tony Johnson
- * @version $Id: ITrackerHit.java,v 1.8 2004/09/24 13:21:22 tonyj Exp $
+ * @version $Id: ITrackerHit.java,v 1.9 2009/07/22 16:03:36 engels Exp $
*/
public class ITrackerHit extends ILCObject implements TrackerHit
{
@@ -16,6 +16,7 @@
protected float dEdx;
protected float time;
protected int type;
+ protected int quality;
protected List rawHits = new ArrayList() ;
public double[] getPosition()
@@ -63,6 +64,17 @@
this.time = time;
}
+ public int getQuality()
+ {
+ return quality;
+ }
+
+ public void setQuality(int quality)
+ {
+ checkAccess();
+ this.quality = quality;
+ }
+
public int getType()
{
return type;
lcio/src/java/hep/lcio/implementation/sio
diff -u -r1.10 -r1.11
--- SIOTrackerHit.java 7 Nov 2007 20:46:23 -0000 1.10
+++ SIOTrackerHit.java 22 Jul 2009 16:03:36 -0000 1.11
@@ -16,7 +16,7 @@
/**
*
* @author Tony Johnson
- * @version $Id: SIOTrackerHit.java,v 1.10 2007/11/07 20:46:23 jeremy Exp $
+ * @version $Id: SIOTrackerHit.java,v 1.11 2009/07/22 16:03:36 engels Exp $
*/
class SIOTrackerHit extends ITrackerHit
{
@@ -31,6 +31,7 @@
covMatrix[i] = in.readFloat();
dEdx = in.readFloat();
time = in.readFloat();
+ quality = in.readInt();
int nRawHits = 1 ;
if( SIOVersion.encode(major,minor) > SIOVersion.encode(1,2))
@@ -80,6 +81,7 @@
out.writeFloat(matrix[i]);
out.writeFloat(hit.getdEdx());
out.writeFloat(hit.getTime());
+ out.writeInt(hit.getQuality());
List rawHits = hit.getRawHits() ;
out.writeInt( rawHits.size()) ;
@@ -101,6 +103,7 @@
out.writeFloat(covMatrix[i]);
out.writeFloat(dEdx);
out.writeFloat(time);
+ out.writeInt(quality);
out.writeInt( rawHits.size()) ;
for (int i = 0; i < rawHits.size() ; i++)
lcio/src/latex/manual
diff -u -r1.19 -r1.20
--- f77summary.tex 24 Mar 2006 13:36:44 -0000 1.19
+++ f77summary.tex 22 Jul 2009 16:03:36 -0000 1.20
@@ -253,6 +253,7 @@
setdEdx -> status = lctrhsetdedx( ptrhit, dedx )
setTime -> status = lctrhsettime( ptrhit, time )
setType -> status = lctrhsettype( ptrhit, itype )
+setQuality -> status = lctrhsetquality( ptrhit , iquality )
addRawHit -> status = lctrhaddrawhit( ptrhit, prawh )
id -> id = lctrhid( ptrhit )
@@ -261,6 +262,7 @@
getdEdx -> dedx = lctrhgetdedx( ptrhit )
getTime -> time = lctrhgettime( ptrhit )
getType -> itype = lctrhgettype( ptrhit )
+getQuality -> iquality= lctrhgetquality( ptrhit )
getRawHits -> prawhv = lctrhgetrawhits( ptrhit )
CVSspam 0.2.8
