Commit in lcsim-contrib/src/main/java/org/lcsim/contrib on MAIN
JanStrube/CLIC_Studies/BackgroundHitDropper.java+2-21.1 -> 1.2
                      /CollectionDropper.java+21.1 -> 1.2
                      /DropSlicPandoraCollections.java+3-21.1 -> 1.2
                      /MuonHelicity.java+21.1 -> 1.2
homer/vvHratio/sid/java/MyDBDvvH.java+3-101.2 -> 1.3
                       /MyDBDvvHAnalysis.java+19-171.2 -> 1.3
                       /MyJetFindingDriver.java+21.1 -> 1.2
                       /PFOJetFindingDriver.java+8-141.2 -> 1.3
homer/vvHratio/sid/javaeid/MyDBDvvHAnalysiseid.java+12-141.1 -> 1.2
                          /MyDBDvvHeid.java+5-71.1 -> 1.2
twhite/MuonAnalysis.java+2-21.1 -> 1.2
      /MuonAnalysisTest.java+2-21.1 -> 1.2
+62-70
12 modified files
fix various compilation problems mostly related to people's lack of correct package statements; also removed characters that UTF-8 does not recognize
lcsim-contrib/src/main/java/org/lcsim/contrib/JanStrube/CLIC_Studies
BackgroundHitDropper.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- BackgroundHitDropper.java	19 Jan 2012 16:00:11 -0000	1.1
+++ BackgroundHitDropper.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,12 +1,12 @@

+package org.lcsim.contrib.JanStrube.CLIC_Studies;
+

 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

-import java.util.HashMap;

 
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;

-import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.event.Track;
 import org.lcsim.event.TrackerHit;
lcsim-contrib/src/main/java/org/lcsim/contrib/JanStrube/CLIC_Studies
CollectionDropper.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- CollectionDropper.java	19 Jan 2012 16:00:11 -0000	1.1
+++ CollectionDropper.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,3 +1,5 @@

+package org.lcsim.contrib.JanStrube.CLIC_Studies;
+

 // MainLoop.java
 // Java wrapper to enable running outside of JAS3
 // 16-JUL-2005 Jan Strube
lcsim-contrib/src/main/java/org/lcsim/contrib/JanStrube/CLIC_Studies
DropSlicPandoraCollections.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- DropSlicPandoraCollections.java	19 Jan 2012 16:00:11 -0000	1.1
+++ DropSlicPandoraCollections.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,12 +1,13 @@

+package org.lcsim.contrib.JanStrube.CLIC_Studies;
+

 // MainLoop.java
 // Java wrapper to enable running outside of JAS3
 // 16-JUL-2005 Jan Strube
 // from a response to the JAS mailing list by Tony Johnson
 
 import java.io.File;

-import org.lcsim.mc.fast.MCFast;

+

 import org.lcsim.util.Driver;

-import org.lcsim.util.aida.AIDA;

 import org.lcsim.util.loop.LCIODriver;
 import org.lcsim.util.loop.LCSimLoop;
lcsim-contrib/src/main/java/org/lcsim/contrib/JanStrube/CLIC_Studies
MuonHelicity.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MuonHelicity.java	19 Jan 2012 16:00:11 -0000	1.1
+++ MuonHelicity.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,3 +1,5 @@

+package org.lcsim.contrib.JanStrube.CLIC_Studies;
+

 import hep.physics.vec.HepLorentzVector;
 import hep.physics.vec.VecOp;
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/java
MyDBDvvH.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- MyDBDvvH.java	23 Apr 2013 23:33:58 -0000	1.2
+++ MyDBDvvH.java	23 Sep 2013 23:40:16 -0000	1.3
@@ -1,20 +1,13 @@

-package org.lcsim.contrib.homer;

+package org.lcsim.contrib.homer.vvHratio.sid.java;
+

 import java.util.List;
 
 //import org.lcsim.event.*;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;

-import org.lcsim.event.ReconstructedParticle;

+import org.lcsim.recon.postrecon.leptonID.electron.IsolatedHighPElectronIdentifier;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

-import org.lcsim.recon.postrecon.leptonID.electron.*;
-import org.lcsim.contrib.homer.PFOJetFindingDriver;
-import org.lcsim.contrib.homer.MyDBDvvHAnalysis;
-
-import java.util.*;
-import java.io.IOException;
-
-

 
 public class MyDBDvvH extends Driver {
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/java
MyDBDvvHAnalysis.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- MyDBDvvHAnalysis.java	23 Apr 2013 23:33:58 -0000	1.2
+++ MyDBDvvHAnalysis.java	23 Sep 2013 23:40:16 -0000	1.3
@@ -1,26 +1,28 @@

-package org.lcsim.contrib.homer;

+package org.lcsim.contrib.homer.vvHratio.sid.java;
+

 //import org.lcsim.util.aida.AIDA;

-import hep.aida.*;
-import org.lcsim.util.aida.*;
-import hep.physics.vec.VecOp;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHepLorentzVector;
-import hep.physics.vec.HepLorentzVector;

+import hep.aida.IHistogram1D;

 import hep.physics.jet.EventShape;

-import java.util.List;
-import org.lcsim.util.Driver;
-import org.lcsim.event.*;

+import hep.physics.vec.HepLorentzVector;
+import hep.physics.vec.VecOp;

 

+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;

 import java.util.ArrayList;

-import java.util.Collections;

+import java.util.List;

 

-import org.lcsim.spacegeom.CartesianPoint;
-import org.lcsim.spacegeom.CartesianVector;
-import org.lcsim.spacegeom.SpacePoint;

+import org.lcsim.event.EventHeader;
+import org.lcsim.event.LCRelation;
+import org.lcsim.event.MCParticle;
+import org.lcsim.event.ParticleID;
+import org.lcsim.event.ReconstructedParticle;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackState;
+import org.lcsim.event.Vertex;

 import org.lcsim.spacegeom.SpaceVector;

-
-import java.nio.*;
-import java.io.*;

+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;

 
 public class MyDBDvvHAnalysis extends Driver
 {
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/java
MyJetFindingDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyJetFindingDriver.java	11 Oct 2012 16:17:22 -0000	1.1
+++ MyJetFindingDriver.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,3 +1,5 @@

+package org.lcsim.contrib.homer.vvHratio.sid.java;
+

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/java
PFOJetFindingDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- PFOJetFindingDriver.java	23 Apr 2013 23:33:58 -0000	1.2
+++ PFOJetFindingDriver.java	23 Sep 2013 23:40:16 -0000	1.3
@@ -1,24 +1,18 @@

-package org.lcsim.contrib.homer;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;

+package org.lcsim.contrib.homer.vvHratio.sid.java;

 
 import hep.physics.jet.JadeEJetFinder;
 import hep.physics.jet.JetFinder;
 import hep.physics.vec.HepLorentzVector;
 import hep.physics.vec.VecOp;
 

-import org.lcsim.util.aida.AIDA;
-import org.lcsim.util.Driver;
-import org.lcsim.event.*;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 

-import org.lcsim.spacegeom.CartesianPoint;
-import org.lcsim.spacegeom.CartesianVector;
-import org.lcsim.spacegeom.SpacePoint;
-import org.lcsim.spacegeom.SpaceVector;

+import org.lcsim.event.EventHeader;
+import org.lcsim.event.ReconstructedParticle;
+import org.lcsim.util.Driver;

 
 
 public class PFOJetFindingDriver extends Driver {
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/javaeid
MyDBDvvHAnalysiseid.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyDBDvvHAnalysiseid.java	12 Oct 2012 18:11:39 -0000	1.1
+++ MyDBDvvHAnalysiseid.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,22 +1,20 @@

-//import org.lcsim.util.aida.AIDA;
-import hep.aida.*;
-import org.lcsim.util.aida.*;

+package org.lcsim.contrib.homer.vvHratio.sid.javaeid;
+
+import hep.aida.IProfile1D;

 import hep.physics.vec.VecOp;

-import hep.physics.vec.Hep3Vector;
-import java.util.List;
-import org.lcsim.util.Driver;
-import org.lcsim.event.*;
-import org.lcsim.util.lcio.LCIOConstants;
-import org.lcsim.geometry.*;
-import org.lcsim.recon.util.McTruthLinker;

 
 import java.util.ArrayList;

-import java.util.Collections;

+import java.util.List;

 

-import org.lcsim.spacegeom.CartesianPoint;
-import org.lcsim.spacegeom.CartesianVector;
-import org.lcsim.spacegeom.SpacePoint;

+import org.lcsim.event.EventHeader;
+import org.lcsim.event.LCRelation;
+import org.lcsim.event.MCParticle;
+import org.lcsim.event.ReconstructedParticle;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackState;

 import org.lcsim.spacegeom.SpaceVector;

+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
lcsim-contrib/src/main/java/org/lcsim/contrib/homer/vvHratio/sid/javaeid
MyDBDvvHeid.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyDBDvvHeid.java	12 Oct 2012 18:11:39 -0000	1.1
+++ MyDBDvvHeid.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,17 +1,15 @@

+package org.lcsim.contrib.homer.vvHratio.sid.javaeid;
+

 import java.util.List;
 

+import org.lcsim.contrib.homer.vvHratio.sid.java.PFOJetFindingDriver;

 //import org.lcsim.event.*;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;

-import org.lcsim.event.ReconstructedParticle;

+import org.lcsim.recon.postrecon.leptonID.electron.AddBremPhotonsToElectrons;
+import org.lcsim.recon.postrecon.leptonID.electron.IsolatedHighPElectronIdentifier;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

-import org.lcsim.recon.postrecon.leptonID.electron.*;
-
-import java.util.*;
-import java.io.IOException;
-
-

 
 public class MyDBDvvHeid extends Driver {
lcsim-contrib/src/main/java/org/lcsim/contrib/twhite
MuonAnalysis.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MuonAnalysis.java	12 Aug 2009 08:52:02 -0000	1.1
+++ MuonAnalysis.java	23 Sep 2013 23:40:16 -0000	1.2
@@ -1,6 +1,6 @@

-package main.java.org.lcsim.contrib.twhite;

+package org.lcsim.contrib.twhite;

 /**

- * @version $Id: MuonAnalysis.java,v 1.1 2009/08/12 08:52:02 twhite Exp $

+ * @version $Id: MuonAnalysis.java,v 1.2 2013/09/23 23:40:16 jeremy Exp $

  * @author T White
  */
lcsim-contrib/src/main/java/org/lcsim/contrib/twhite
MuonAnalysisTest.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MuonAnalysisTest.java	12 Aug 2009 08:52:02 -0000	1.1
+++ MuonAnalysisTest.java	23 Sep 2013 23:40:17 -0000	1.2
@@ -1,6 +1,6 @@

-package main.java.org.lcsim.contrib.twhite;

+package org.lcsim.contrib.twhite;

 /**

- * @version $Id: MuonAnalysisTest.java,v 1.1 2009/08/12 08:52:02 twhite Exp $

+ * @version $Id: MuonAnalysisTest.java,v 1.2 2013/09/23 23:40:17 jeremy Exp $

  * @author T White
  */
CVSspam 0.2.12

Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1