Print

Print


Commit in lcsim/src/org/lcsim/recon on MAIN
tracking/digitization/sisim/TrackerHitDriver.java+3-21.4 -> 1.5
tracking/digitization/sisim/config/DigiDriver.java+2-11.1 -> 1.2
tracking/seedtracker/digiexample/DigiHitWriter.java+2-11.4 -> 1.5
tracking/seedtracker/trackingdrivers/sidloi2/TrackerHitDriver_sidloi2.java+3-21.1 -> 1.2
vertexing/pixsim/PixilatedSensorManager.java+4-31.1 -> 1.2
+14-9
5 modified files
remove non-standard flag for RawTrackerHits from tracking output because it kills interoperability; need to use relations for this or update the LCIO standard

lcsim/src/org/lcsim/recon/tracking/digitization/sisim
TrackerHitDriver.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- TrackerHitDriver.java	24 Aug 2009 23:07:39 -0000	1.4
+++ TrackerHitDriver.java	18 Mar 2010 01:15:11 -0000	1.5
@@ -276,7 +276,8 @@
         // Is that all there is?
         
 //        System.out.println("# Strip2D Hits:"+hits_strip2D.size());
-        int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
+        //int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
+        int flag = (1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
         event.put(getRawHitsName(),raw_hits,RawTrackerHit.class,flag,toString());
         event.put(getStripHits1DName(),hits_strip1D,SiTrackerHitStrip1D.class,0,toString());
         event.put(getPixelHitsName(),hits_pixel,SiTrackerHitPixel.class,0,toString());
@@ -362,4 +363,4 @@
 ////                    {
 ////                        hits.addAll(_pixel_clusterer.makeHits(electrodes));
 ////                    }
-//                }
\ No newline at end of file
+//                }

lcsim/src/org/lcsim/recon/tracking/digitization/sisim/config
DigiDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- DigiDriver.java	24 Aug 2009 23:07:39 -0000	1.1
+++ DigiDriver.java	18 Mar 2010 01:15:11 -0000	1.2
@@ -83,7 +83,8 @@
 			trackerHits.addAll(clusterer.makeHits(sensor));
 		}			
 		
-		int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1);
+		//int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1);
+		int flag = (1 << LCIOConstants.TRAWBIT_ID1);
 		event.put(rawHitsCollectionName, rawHits, RawTrackerHit.class, flag, toString());
         event.put(trackerHitsCollectionName, trackerHits, TrackerHit.class, 0, toString());
 	}

lcsim/src/org/lcsim/recon/tracking/seedtracker/digiexample
DigiHitWriter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- DigiHitWriter.java	24 Apr 2009 01:25:09 -0000	1.4
+++ DigiHitWriter.java	18 Mar 2010 01:15:11 -0000	1.5
@@ -76,7 +76,8 @@
             }
             
             if (!newRawHits.isEmpty()) {
-                event.put("RawTrackerHitDependencies", newRawHits , RawTrackerHit.class, (1 << (LCIOConstants.RTHBIT_HITS))); 
+                //event.put("RawTrackerHitDependencies", newRawHits , RawTrackerHit.class, (1 << (LCIOConstants.RTHBIT_HITS))); 
+                event.put("RawTrackerHitDependencies", newRawHits , RawTrackerHit.class, 0); 
             }
         }
         

lcsim/src/org/lcsim/recon/tracking/seedtracker/trackingdrivers/sidloi2
TrackerHitDriver_sidloi2.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerHitDriver_sidloi2.java	27 Sep 2009 03:23:22 -0000	1.1
+++ TrackerHitDriver_sidloi2.java	18 Mar 2010 01:15:11 -0000	1.2
@@ -190,7 +190,8 @@
 
         }
 
-        int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
+        //int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
+        int flag = (1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence 
         event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
         event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
         event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
@@ -223,4 +224,4 @@
     public String getPixelHitsName() {
         return _pixel_clusterer.getName() + "_SiTrackerHitPixel";
     }
-}
\ No newline at end of file
+}

lcsim/src/org/lcsim/recon/vertexing/pixsim
PixilatedSensorManager.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- PixilatedSensorManager.java	9 Dec 2008 23:36:34 -0000	1.1
+++ PixilatedSensorManager.java	18 Mar 2010 01:15:11 -0000	1.2
@@ -20,7 +20,7 @@
  * for each event (only sensors which have hits in them are created)
  *
  * @author Nick Sinev
- * @version $Id: PixilatedSensorManager.java,v 1.1 2008/12/09 23:36:34 jeremy Exp $
+ * @version $Id: PixilatedSensorManager.java,v 1.2 2010/03/18 01:15:11 jeremy Exp $
  */
 
 public class PixilatedSensorManager extends Driver
@@ -803,8 +803,9 @@
 //  System.out.println("Endcap minus hits processed!");
   event.put("RecVtxBarrHits",ebhits,TrackerHit.class,0);  
   event.put("RecVtxEndcapHits",eehits,TrackerHit.class,0);
-  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,(1 << LCIOConstants.RTHBIT_HITS));
+  //event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,(1 << LCIOConstants.RTHBIT_HITS));
+  event.put("RecVtxRawHits",rawhits,RawTrackerHit.class,0);
 
  } // end function process
 
-}
\ No newline at end of file
+}
CVSspam 0.2.8