Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill on MAIN
SRPdijetm.java+15-21.1 -> 1.2

lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
SRPdijetm.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SRPdijetm.java	12 Aug 2009 18:33:59 -0000	1.1
+++ SRPdijetm.java	14 Feb 2012 19:35:58 -0000	1.2
@@ -15,6 +15,7 @@
 {
     private String _jlinkmap;
     private String _scinjets;
+    private String _dmcorr;
     private AIDA aida = AIDA.defaultInstance();
 
     public SRPdijetm()
@@ -26,6 +27,8 @@
     {
         super.process(event);
 
+        //  get mass correction from tracks
+        List<Double> Delm = event.get(Double.class, _dmcorr);
         // array of ReconstructedParticles to add to the event...
         List<ReconstructedParticle> rpList = new ArrayList<ReconstructedParticle>();
 
@@ -74,7 +77,7 @@
             aida.cloud1D("C over S ratio per jet").fill(scrat);
 //           System.out.println("CS ratio " + scrat);
 //            double sjetCE = jet.getEnergy()/(.555-.200*scrat+.643*scrat*scrat);
-            double sjetCE = jet.getEnergy()/(.480+.628*scrat-1.085*scrat*scrat+.975*scrat*scrat*scrat);
+            double sjetCE = jet.getEnergy()/(.587+.173*scrat-.291*scrat*scrat+.531*scrat*scrat*scrat);
 //            double sjetCE = jet.getEnergy()/(.68+.31*scrat);
             aida.cloud1D("Correction Factor for Jets").fill(jet.getEnergy()/sjetCE);
             Hep3Vector jmom = jet.getMomentum();
@@ -114,7 +117,12 @@
         }
         double ptot = Math.sqrt(jpx*jpx+jpy*jpy+jpz*jpz);
         double jinv = Math.sqrt(Etot*Etot-ptot*ptot+mjtot2);
-        aida.cloud1D("Ceren Corrected Scin Jet Mass").fill(jinv);
+        double mcor = 0.;
+        for (Double dlm : Delm)
+        {
+            mcor = dlm.doubleValue();
+        }
+        aida.cloud1D("Ceren Corrected Scin Jet Mass").fill(jinv-mcor);
         aida.cloud1D("Ceren Corrected Scin Jet ETot").fill(Etot);
 //        System.out.println("Total S Jet Mass " + jinv);
         }
@@ -129,5 +137,10 @@
   {
       _scinjets = scinjets;
   }
+
+    public void setDeltaMCorr(String dmcorr)
+    {
+        _dmcorr = dmcorr;
+    }
   
 }
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