Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn on MAIN
Wrapper.java+24added 1.1
JetFinder1.java+6-1061.1 -> 1.2
+30-106
1 added + 1 modified, total 2 files
no message

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn
Wrapper.java added at 1.1
diff -N Wrapper.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Wrapper.java	23 Jun 2009 17:37:27 -0000	1.1
@@ -0,0 +1,24 @@
+package org.lcsim.contrib.Mbussonn;
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+import org.lcsim.contrib.sATLAS.TrackReconstructionDriver;
+import org.lcsim.util.Driver;
+
+
+
+/**
+ *
+ * @author matthiasbussonnier
+ */
+public class Wrapper extends Driver{
+
+
+   public Wrapper()
+   {
+		//add(new JetDriverExtended());
+		//add(new TrackReconstructionDriver());
+        add(new JetFinder1());
+   }
+}

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn
JetFinder1.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- JetFinder1.java	23 Jun 2009 01:17:46 -0000	1.1
+++ JetFinder1.java	23 Jun 2009 17:37:27 -0000	1.2
@@ -5,27 +5,7 @@
  */
 import hep.aida.IHistogramFactory;
 import hep.aida.IProfile1D;
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import java.util.ArrayList;
-import java.util.LinkedList;
-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.mgraham.sATLASDigi.FindableTrack.Ignore;
-import org.lcsim.contrib.sATLAS.TrackReconstructionDriver;
 import org.lcsim.event.EventHeader;
-import org.lcsim.event.LCRelation;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.RelationalTable;
-import org.lcsim.event.Track;
-import org.lcsim.event.base.BaseRelationalTable;
-import org.lcsim.fit.helicaltrack.HelicalTrackFit;
-import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
-import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
-import org.lcsim.recon.vertexing.zvtop4.VectorArithmetic;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 
@@ -37,98 +17,18 @@
  */
 public class JetFinder1 extends Driver{
    private AIDA aida = AIDA.defaultInstance();
-   private IProfile1D gx;
+   private IProfile1D gx=null;
    public JetFinder1()
    {
       //super.add(new MCFast());
-		this.add(new JetDriverExtended());
-		this.add(new TrackReconstructionDriver());
 		IHistogramFactory hf = aida.histogramFactory();
-		gx = hf.createProfile1D("track finding efficiency vs angle ",18,.0,6.0);
-//		gx.fill(1,1);
-//	  int i;
+		if(gx == null){
+            gx = hf.createProfile1D("track finding efficiency vs angle ",18,-6.0,6.0);
+            System.out.println("creating gx "+gx);
+            }
    }
 
-	@Override
-	@SuppressWarnings("unchecked")
    protected void process(EventHeader event)
-   {
-	this.processChildren(event);
-      //super.process(event);
-      List<ReconstructedParticle> jets = event.get(ReconstructedParticle.class,"Jets");
-    //  aida.cloud1D("nJets").fill(jets.size());
-      //for (ReconstructedParticle jet : jets)
-      //{
-      //   List<ReconstructedParticle> particlesInJet = jet.getParticles();
-      //   aida.cloud1D("nParticles").fill(particlesInJet.size());
-      //}
-		RelationalTable     hittomc     = new BaseRelationalTable(RelationalTable.Mode.MANY_TO_MANY, RelationalTable.Weighting.UNWEIGHTED);
-		RelationalTable     trktomc     = new BaseRelationalTable(RelationalTable.Mode.MANY_TO_MANY, RelationalTable.Weighting.UNWEIGHTED);
-		List<LCRelation>    mcrelations = event.get(LCRelation.class, "HelicalTrackMCRelations");
-		List<Track>         tracklist   = event.getTracks();
-		for (LCRelation relation : mcrelations) {
-			hittomc.add(relation.getFrom(), relation.getTo());
-			}
-		//******ajoute une ralation entre reconstructed particle and mcp ********//
-		RelationalTable     rc2mc     = new BaseRelationalTable(RelationalTable.Mode.MANY_TO_MANY, RelationalTable.Weighting.UNWEIGHTED);
-		List<LCRelation>    rcmcfe    = event.get(LCRelation.class, "rc2mc");//collection of relation is onyread once here
-		for (LCRelation relation : rcmcfe) {								 // the collection of rcp is not load anywhere
-			rc2mc.add(relation.getFrom(), relation.getTo());
-			}
-		
-		for (Track track : tracklist) {
-			TrackAnalysis tkanal = new TrackAnalysis(track, hittomc);
-			MCParticle mcp = tkanal.getMCParticle();
-			tkanal=null;
-			double px	  = track.getPX();
-			double py	  = track.getPY();
-			double pz	  = track.getPZ();
-			double ptotal = Math.sqrt(px*px+py*py+pz*pz);
-			double ptcut  = 50.;
-
-			if(track.getCharge()==0)
-				continue;
-			if( ptotal < ptcut)
-				continue;
-			if (mcp != null)
-				trktomc.add(track, mcp);
-			}
-
-		int i=0;
-		List<MCParticle> mcplist = new LinkedList<MCParticle>();//event.getMCParticles();
-		
-		for(ReconstructedParticle jet : jets){
-			mcplist.clear();
-			List<ReconstructedParticle> listOfParticles = jet.getParticles();
-			for(ReconstructedParticle rcpInJet : listOfParticles){
-				MCParticle mcpp = (MCParticle) rc2mc.to(rcpInJet);
-				if(mcpp != null)
-					mcplist.add(mcpp);
-			}
-			
-			if(mcplist.size()!=0){
-			System.out.println("mcplist size :"+mcplist.size());
-			System.out.println("gx is "+gx+" aida is "+aida);
-			System.out.println("in jets");
-			for(i=0;i<20;i++){
-				gx.fill(1,1);
-				}
-			}
-			mcplist.clear();
-		}
-		//* from here
-		mcplist = event.getMCParticles();
-		if(mcplist.size()!=0){
-		int j ;
-			System.out.println("in event");
-			for(j=0;j<20;j++){
-				gx.fill(2,3);
-				
-			}
-		}
-		//to here */
-   }
-
-
+   {}
 
 }
CVSspam 0.2.8