Commit in lcsim-contrib/src/main/java/org/lcsim/contrib on MAIN
sATLAS/UTOPIA7/TrackAnalysisDriver.java+21.2 -> 1.3
Partridge/sATLASEfficiency/TrackAnalysisDriver.java+2-11.1 -> 1.2
Mbussonn/ex/TrackAnalysisDriverSatlas.java+4-21.1 -> 1.2
           /LOIEffFakeMG.java+3-21.1 -> 1.2
           /EventProcessor.java+3-21.1 -> 1.2
Mbussonn/JetFinder/JetFinderAnalyze.java+2-11.1 -> 1.2
                  /JetFinder.java+2-11.8 -> 1.9
Mbussonn/MuonsBoth.java+4-31.3 -> 1.4
        /MuonsAnalysis.java+3-21.1 -> 1.2
sATLAS/TrackAnalysisDriver.java+3-21.3 -> 1.4
+28-16
10 modified files
trying to fix my screwup and get TrackAnalysis and FindableTrack to work in the sATLAS contrib area...have had to change Rich's and Mattias' contrib areas to pint to the new place
lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS/UTOPIA7
TrackAnalysisDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- TrackAnalysisDriver.java	20 Aug 2009 17:30:41 -0000	1.2
+++ TrackAnalysisDriver.java	20 Aug 2009 17:47:58 -0000	1.3
@@ -77,6 +77,8 @@

     int nevt = 0;
     int _nmcTrk = 0;
     double _nrecTrk = 0;

+
+

     double ptTrkCut = 1.0; //GeV
     double d0TrkCut = 2.0; //mm
     double z0TrkCut = 200.0; //mm
lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASEfficiency
TrackAnalysisDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackAnalysisDriver.java	19 Aug 2009 22:45:39 -0000	1.1
+++ TrackAnalysisDriver.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -27,7 +27,8 @@

 import java.util.Set;
 //import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 //import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/ex
TrackAnalysisDriverSatlas.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackAnalysisDriverSatlas.java	23 Jun 2009 22:15:40 -0000	1.1
+++ TrackAnalysisDriverSatlas.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -8,7 +8,7 @@

 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;

+

 import hep.aida.IHistogram1D;
 import hep.aida.IHistogramFactory;
 import hep.aida.IProfile1D;

@@ -27,7 +27,9 @@

 import java.util.Set;
 //import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 //import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/ex
LOIEffFakeMG.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- LOIEffFakeMG.java	23 Jun 2009 22:15:40 -0000	1.1
+++ LOIEffFakeMG.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -19,8 +19,9 @@

 import java.util.Set;
 //import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 //import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;
-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
 import org.lcsim.event.MCParticle;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/ex
EventProcessor.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- EventProcessor.java	23 Jun 2009 22:15:40 -0000	1.1
+++ EventProcessor.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -13,8 +13,9 @@

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;
-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.event.*;
 import org.lcsim.event.base.BaseRelationalTable;
 import org.lcsim.fit.helicaltrack.*;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder
JetFinderAnalyze.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- JetFinderAnalyze.java	29 Jun 2009 18:13:08 -0000	1.1
+++ JetFinderAnalyze.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -12,7 +12,8 @@

 import java.util.List;
 import java.util.Set;
 import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
 import org.lcsim.event.MCParticle;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder
JetFinder.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- JetFinder.java	13 Aug 2009 20:40:13 -0000	1.8
+++ JetFinder.java	20 Aug 2009 17:47:58 -0000	1.9
@@ -11,7 +11,8 @@

 import java.util.Set;
 import java.util.Vector;
 import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
 import org.lcsim.event.MCParticle;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn
MuonsBoth.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- MuonsBoth.java	13 Aug 2009 20:40:12 -0000	1.3
+++ MuonsBoth.java	20 Aug 2009 17:47:58 -0000	1.4
@@ -14,11 +14,12 @@

 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;
-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+

 //import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;

+
+import org.lcsim.contrib.sATLAS.FindableTrack;
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.digisim.MyLCRelation;
 import org.lcsim.event.base.BaseRelationalTable;
 import org.lcsim.event.EventHeader;
lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn
MuonsAnalysis.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MuonsAnalysis.java	3 Jun 2009 00:20:09 -0000	1.1
+++ MuonsAnalysis.java	20 Aug 2009 17:47:58 -0000	1.2
@@ -16,9 +16,10 @@

 //import org.lcsim.contrib.KFFitter.KFTrack;
 //import org.lcsim.contrib.KFFitter.KFTrackParameters;
 //import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack;
-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+

 //import org.lcsim.event.TrackerHit;

+import org.lcsim.contrib.sATLAS.FindableTrack;
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.event.base.BaseRelationalTable;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS
TrackAnalysisDriver.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- TrackAnalysisDriver.java	6 May 2009 23:28:43 -0000	1.3
+++ TrackAnalysisDriver.java	20 Aug 2009 17:47:58 -0000	1.4
@@ -7,7 +7,7 @@

 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

-import org.lcsim.contrib.mgraham.sATLASDigi.*;

+

 import hep.aida.IHistogram1D;
 import hep.aida.IHistogramFactory;
 import hep.aida.IProfile1D;

@@ -26,7 +26,8 @@

 import java.util.Set;
 //import org.lcsim.contrib.Partridge.TrackingTest.FindableTrack.Ignore;
 //import org.lcsim.contrib.Partridge.TrackingTest.TrackAnalysis;

-import org.lcsim.contrib.mgraham.sATLASDigi.FindableTrack.Ignore;

+
+import org.lcsim.contrib.sATLAS.FindableTrack.Ignore;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;
CVSspam 0.2.8