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

diff -u -r1.1.1.1 -r1.2
--- MassPlots.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ MassPlots.java	12 Jan 2009 23:28:58 -0000	1.2
@@ -54,19 +54,31 @@

     ICloud1D m_h2trueResPassingCut2;
     String m_jetListName;
     String m_inputListName;

+    String m_subdet;

     List<Double> m_listMass_PassingCut2;
     List<Double> m_listMass_trueResPassingCut2;
     List<Double> m_listEnergy_PassingCut2;
     List<Double> m_listEnergy_trueResPassingCut2;
 

-    protected double m_cosThetaMin = 0.0;
-    protected double m_cosThetaMax = 0.8;

+    protected double m_cosThetaMin;
+    protected double m_cosThetaMax;

-    public MassPlots(String inputList, String outputFilename) {

+    public MassPlots(String inputList, String outputFilename, String subdet) {

 	m_inputListName = inputList;
 	m_jetListName = new String();
 	m_jetListName += "jetOutput__";
 	m_jetListName += inputList;

+        m_subdet = subdet;
+        if(subdet.contains("Barrel")){
+             m_cosThetaMin = 0.0;
+             m_cosThetaMax = 0.8;
+        }else if(subdet.contains("Endcap")){
+             m_cosThetaMin = 0.8;
+             m_cosThetaMax = 0.95;
+        }else{
+             m_cosThetaMin = 0.0;
+             m_cosThetaMax = 0.95;
+        }

 	JetFinder twojet = new FixNumberOfJetsFinder(2);
 	JetDriver jNonTrivial = new JetDriver();
 	jNonTrivial.setInputCollectionName(inputList);

@@ -85,12 +97,12 @@

 	    m_h2 = m_histoFactory.createCloud1D("eventEnergy");
 	    m_h3 = m_histoFactory.createCloud1D("eventMomentum");
 	    m_h1trueRes = m_histoFactory.createCloud1D("eventMassResidualsToTruth");

-	    m_h1PassingCut = m_histoFactory.createCloud1D("eventMassInBarrel");
-	    m_h1trueResPassingCut = m_histoFactory.createCloud1D("eventMassResidualsToTruthInBarrel");
-	    m_h1PassingCut2 = m_histoFactory.createCloud1D("eventMassInBarrel2");
-	    m_h2PassingCut2 = m_histoFactory.createCloud1D("eventEnergyInBarrel2");
-	    m_h1trueResPassingCut2 = m_histoFactory.createCloud1D("eventMassResidualsToTruthInBarrel2");
-	    m_h2trueResPassingCut2 = m_histoFactory.createCloud1D("eventEnergyResidualsToTruthInBarrel2");

+	    m_h1PassingCut = m_histoFactory.createCloud1D("eventMassIn"+m_subdet);
+	    m_h1trueResPassingCut = m_histoFactory.createCloud1D("eventMassResidualsToTruthIn"+m_subdet);
+	    m_h1PassingCut2 = m_histoFactory.createCloud1D("eventMassIn"+m_subdet+"2");
+	    m_h2PassingCut2 = m_histoFactory.createCloud1D("eventEnergyIn"+m_subdet+"2");
+	    m_h1trueResPassingCut2 = m_histoFactory.createCloud1D("eventMassResidualsToTruthIn"+m_subdet+"2");
+	    m_h2trueResPassingCut2 = m_histoFactory.createCloud1D("eventEnergyResidualsToTruthIn"+m_subdet+"2");

 	} catch (IOException ioe1) {
             ioe1.printStackTrace(); 
 	}

@@ -210,7 +222,7 @@

 		double sign = 1.;
 		if(masssq < 0.)sign = -1.;
 		double signedMass = sign*Math.sqrt(sign*masssq);

-		if( (Math.abs(ct) < .8)&&(Math.abs(ct1) < .8) ) {

+    		if( (Math.abs(ct) > m_cosThetaMin)&&(Math.abs(ct) < m_cosThetaMax)&&(Math.abs(ct1) > m_cosThetaMin)&&(Math.abs(ct1)<m_cosThetaMax) ) {

 		    //System.out.println("EVENT PASSES CUT, since cos(theta) = "+ct+", "+ct1+". Jet-jet mass = "+signedMass);
 		    m_h1PassingCut.fill(evtmass);
 		    if (partZToqq != null) {

@@ -249,6 +261,7 @@

             ioe1.printStackTrace(); 
         }
 

+        System.out.println(m_subdet + "("+ m_cosThetaMin + " < cos theta < " + m_cosThetaMax +")");

 	printRMS90(m_listMass_trueResPassingCut2, "Mass residuals: ");
 	printRMS90(m_listEnergy_trueResPassingCut2, "Energy residuals: ");
 

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

diff -u -r1.1.1.1 -r1.2
--- ExampleReadPFA.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ ExampleReadPFA.java	12 Jan 2009 23:28:59 -0000	1.2
@@ -15,8 +15,7 @@

 public class ExampleReadPFA extends Driver
 {
     public ExampleReadPFA() {

-	add(new MassPlots("PFAReconstructedParticles", "output-read.aida"));
-	add(new MassPlots("DTreeReclusteredParticles", "output-read-reclustered-dtree.aida"));
-	add(new MassPlots("DTreeReclusteredParticles_withEoverPveto", "output-read-reclustered-dtree-veto.aida"));

+        add(new MassPlots("FlushedDTreeReclusteredParticles", "output-read-reclustered-dtree.aida","Endcap"));
+        add(new MassPlots("FlushedDTreeReclusteredParticles", "output-read-reclustered-dtree.aida","Barrel"));

     }
 }