Print

Print


Commit in lcio/src/java/hep/lcio/implementation on MAIN
event/ITrackerPulse.java+20-11.1 -> 1.2
sio/SIOTrackerPulse.java+9-11.2 -> 1.3
+29-2
2 modified files
FIX FOR ACCIDENTAL COMMIT ON 2010-05-04 17:04:
AFFECTED FILES: doc/lcio.xml, src/aid/EVENT/TrackerPulse.aid, src/cpp/CMakeLists.txt, src/cpp/include/IMPL/TrackerPulseImpl.h, src/cpp/src/IMPL/TrackerPulse
MISSING CHANGES: src/java/hep/lcio/implementation/event/ITrackerPulse.java, src/java/hep/lcio/implementation/sio/SIOTrackerPulse.java
WRONG LOG MESSAGE: bug fix: missing {} in if statement
MESSAGE SHOULD READ: added timeError and chargeError attributes to TrackerPulse (http://bugs.freehep.org/browse/LCIO-72)

lcio/src/java/hep/lcio/implementation/event
ITrackerPulse.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ITrackerPulse.java	31 May 2005 07:43:30 -0000	1.1
+++ ITrackerPulse.java	5 May 2010 09:02:25 -0000	1.2
@@ -6,16 +6,18 @@
 /**
  *
  * @author tonyj
- * @version $Id: ITrackerPulse.java,v 1.1 2005/05/31 07:43:30 gaede Exp $
+ * @version $Id: ITrackerPulse.java,v 1.2 2010/05/05 09:02:25 engels Exp $
  */
 public class ITrackerPulse extends ILCObject implements TrackerPulse
 {
    protected int cellID0;
    protected int cellID1;
    protected float charge;
+   protected float chargeError;
    protected int quality;
    protected TrackerData correctedData;
    protected float time;
+   protected float timeError;
    
  
    
@@ -47,6 +49,9 @@
    {
       return charge;
    }
+   public float getChargeError()
+   {
+      return chargeError;
    
    public int getQuality()
    {
@@ -62,6 +67,10 @@
    {
       return time;
    }
+   public float getTimeError()
+   {
+      return timeError;
+   }
    
    
    public void setCharge(float charge)
@@ -69,6 +78,11 @@
       checkAccess();
       this.charge = charge;
    }
+   public void setChargeError(float chargeError)
+   {
+      checkAccess();
+      this.chargeError = chargeError;
+   }
    
    public void setQuality(int quality)
    {
@@ -88,4 +102,9 @@
       checkAccess();
       this.time = time;
    }
+   public void setTimeError(float timeError)
+   {
+      checkAccess();
+      this.timeError = timeError;
+   }
 }

lcio/src/java/hep/lcio/implementation/sio
SIOTrackerPulse.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SIOTrackerPulse.java	7 Nov 2007 20:46:23 -0000	1.2
+++ SIOTrackerPulse.java	5 May 2010 09:02:25 -0000	1.3
@@ -12,7 +12,7 @@
 /**
  *
  * @author tonyj
- * @version $Id: SIOTrackerPulse.java,v 1.2 2007/11/07 20:46:23 jeremy Exp $
+ * @version $Id: SIOTrackerPulse.java,v 1.3 2010/05/05 09:02:25 engels Exp $
  */
 public class SIOTrackerPulse extends ITrackerPulse
 {
@@ -27,6 +27,12 @@
 
       time = in.readFloat();
       charge = in.readFloat();
+      timeError = 0;
+      chargeError = 0;
+      if( SIOVersion.encode(major,minor) > SIOVersion.encode(1,12)){
+        timeError = in.readFloat();
+        chargeError = in.readFloat();
+      }
       quality = in.readInt();
       data = in.readPntr();
       in.readPTag(this);
@@ -52,6 +58,8 @@
       if ((flags & (1 << LCIO.TRAWBIT_ID1)) != 0) out.writeInt(cellID1);
       out.writeFloat(time);
       out.writeFloat(charge);
+      out.writeFloat(timeError);
+      out.writeFloat(chargeError);
       out.writeInt(quality);
       out.writePntr(correctedData);
       out.writePTag(this);
CVSspam 0.2.8