Print

Print


Commit in lcsim/src/org/lcsim on MAIN
recon/vertexing/pixsim/PixilatedSensorManager.java+3-31.5 -> 1.6
util/lcio/LCIOConstants.java+1-11.13 -> 1.14
         /SIORawTrackerHit.java+7-11.8 -> 1.9
+11-5
3 modified files
remove non-standard lcio causing compatibility problems

lcsim/src/org/lcsim/recon/vertexing/pixsim
PixilatedSensorManager.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- PixilatedSensorManager.java	29 Dec 2010 22:29:37 -0000	1.5
+++ PixilatedSensorManager.java	3 Feb 2011 20:11:45 -0000	1.6
@@ -21,7 +21,7 @@
  * for each event (only sensors which have hits in them are created)
  *
  * @author Nick Sinev
- * @version $Id: PixilatedSensorManager.java,v 1.5 2010/12/29 22:29:37 sinev Exp $
+ * @version $Id: PixilatedSensorManager.java,v 1.6 2011/02/03 20:11:45 jeremy Exp $
  */
 
 public class PixilatedSensorManager extends Driver
@@ -966,8 +966,8 @@
   event.put("RecVtxBarrHits",ebhits,TrackerHit.class,0);  
 //  System.out.println("Adding "+eehits.size()+" hits to RecVtxEndcapHits collection");
   event.put("RecVtxEndcapHits",eehits,TrackerHit.class,0);
-  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,(1 << LCIOConstants.RTHBIT_HITS));
-//  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,0);
+//  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,(1 << LCIOConstants.RTHBIT_HITS));
+  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,0);
   if(doHist)
   {
     int nrechits = 0;

lcsim/src/org/lcsim/util/lcio
LCIOConstants.java 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- LCIOConstants.java	23 Nov 2010 18:53:54 -0000	1.13
+++ LCIOConstants.java	3 Feb 2011 20:11:45 -0000	1.14
@@ -67,7 +67,7 @@
    
    // SimTrackerHit references stored (1) - not stored (0).
    // FIXME: Non-standard LCIO constant.  Needs to be propagated to lcio standalone project.
-   int RTHBIT_HITS = 27;
+   //int RTHBIT_HITS = 27;
    
    // 1: pointer tag not added (needed for TrackerHit)
    // LCRelation

lcsim/src/org/lcsim/util/lcio
SIORawTrackerHit.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- SIORawTrackerHit.java	18 Mar 2009 04:21:04 -0000	1.8
+++ SIORawTrackerHit.java	3 Feb 2011 20:11:45 -0000	1.9
@@ -20,7 +20,7 @@
  * 
  * @author Tony Johnson
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SIORawTrackerHit.java,v 1.8 2009/03/18 04:21:04 jeremy Exp $
+ * @version $Id: SIORawTrackerHit.java,v 1.9 2011/02/03 20:11:45 jeremy Exp $
  */
 class SIORawTrackerHit extends BaseRawTrackerHit
 {  
@@ -43,6 +43,7 @@
 		in.pad();
 		// Add support for reading in a list of SimTrackerHits.  --JM
 		// FIXME: Not supported by standard LCIO.
+		/*
 		if ((flags & (1<<LCIOConstants.RTHBIT_HITS)) != 0) {
 			int nhits = in.readInt();
 			tempHits = new ArrayList<SIORef>(nhits);
@@ -50,6 +51,7 @@
 				tempHits.add(in.readPntr());
 			}
 		}
+		*/
 		in.readPTag(this);
 	}
 
@@ -65,6 +67,7 @@
 		out.pad();
 		// Add support for writing out a list of SimTrackerHits.  --JM
 		// FIXME: Not supported by standard LCIO.
+		/*
 		if ((flags & (1<<LCIOConstants.RTHBIT_HITS)) != 0) {
 			out.writeInt(hit.getSimTrackerHits().size());    
 			for (SimTrackerHit simhit : hit.getSimTrackerHits()) 
@@ -72,10 +75,12 @@
 				out.writePntr(simhit);
 			}
 		}
+		*/
 			
 		out.writePTag(hit);
 	}
 
+	/*
 	public List<SimTrackerHit> getSimTrackerHits()
 	{
 		if (simTrackerHits == null && tempHits != null)
@@ -90,4 +95,5 @@
 		}
 		return simTrackerHits;
 	}	
+	*/
 }
CVSspam 0.2.8