LISTSERV 16.5 - LCD-CVS Archives

Commit in `lcsim-contrib/src/main/java/org/lcsim/contrib` on MAIN
`Mbussonn/ex/TrackerHitDriver_sATLAS.java`	+2	-1	1.2 -> 1.3
`Partridge/Occupancy/TrackerHitDriver_sATLAS.java`	+2	-1	1.3 -> 1.4
`Partridge/sATLASEfficiency/TrackerHitDriver_sATLAS.java`	+2	-1	1.2 -> 1.3
`mgraham/DarkPhoton/TrackerHitDriver_DarkPhoton.java`	+2	-1	1.1 -> 1.2
`mgraham/sATLASDigi/TrackerHitDriver_sATLAS.java`	+2	-1	1.8 -> 1.9
`sATLAS/TrackerHitDriver_sATLAS.java`	+2	-1	1.10 -> 1.11
`sATLAS/UTOPIA7/TrackerHitDriver_sATLAS.java`	+2	-1	1.2 -> 1.3
`sATLAS/UTOPIA7Barrel/TrackerHitDriver_sATLAS.java`	+2	-1	1.1 -> 1.2
	+16	-8

8 modified files

remove unsupported lcio option from contrib code to fix the build against lcsim cvs head

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/ex

TrackerHitDriver_sATLAS.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.2
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.3
@@ -251,7 +251,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/Occupancy

TrackerHitDriver_sATLAS.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.3
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.4
@@ -186,7 +186,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASEfficiency

TrackerHitDriver_sATLAS.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.2
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.3
@@ -198,7 +198,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/DarkPhoton

TrackerHitDriver_DarkPhoton.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- TrackerHitDriver_DarkPhoton.java	4 Jan 2010 18:51:13 -0000	1.1
+++ TrackerHitDriver_DarkPhoton.java	24 Feb 2011 18:43:31 -0000	1.2
@@ -196,7 +196,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi

TrackerHitDriver_sATLAS.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.8
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.9
@@ -251,7 +251,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS

TrackerHitDriver_sATLAS.java 1.10 -> 1.11

diff -u -r1.10 -r1.11
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.10
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.11
@@ -198,7 +198,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7

TrackerHitDriver_sATLAS.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- TrackerHitDriver_sATLAS.java	24 Aug 2009 23:12:02 -0000	1.2
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.3
@@ -207,7 +207,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());

lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7Barrel

TrackerHitDriver_sATLAS.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- TrackerHitDriver_sATLAS.java	4 Jan 2010 18:51:13 -0000	1.1
+++ TrackerHitDriver_sATLAS.java	24 Feb 2011 18:43:31 -0000	1.2
@@ -201,7 +201,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());

CVSspam 0.2.8