lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/analysis

diff -u -r1.1 -r1.2
--- QqbarBarrelPhiNonprojAnalysisDriver.java	10 Aug 2010 14:45:34 -0000	1.1
+++ QqbarBarrelPhiNonprojAnalysisDriver.java	10 Aug 2010 21:50:13 -0000	1.2
@@ -163,16 +163,17 @@

       IDataPointSet dpsM;
       IDataPointSet[] dpsM2 = new IDataPointSet[nE];
       dpsE = dpsf.create("dE over E vs cmE","dEoE vs E",2);

-      dpsM = dpsf.create("mean90 vs cmE","m90 vs E",2);

+      dpsM = dpsf.create("dmean90 vs cmE","dm90 vs E",2);

       for(int iE=0;iE<nE;iE++)
       {
          dpsE2[iE] = dpsf.create("E="+Eevt[iE]+":dE over E vs phibin","Ecm="+Eevt[iE]+":dEoE vs phi",2);

-         dpsM2[iE] = dpsf.create("E="+Eevt[iE]+":mean90 vs phibin","Ecm="+Eevt[iE]+":m90 vs phi",2);

+         dpsM2[iE] = dpsf.create("E="+Eevt[iE]+":dmean90 vs phibin","Ecm="+Eevt[iE]+":dm90 vs phi",2);

          ZE = Eevt[iE];
          String rname = "cmE="+Eevt[iE]+"/Event Energy";
           ICloud1D thisc = aida.cloud1D(rname);
           double r90 = calc.calculateRMS90(thisc);
           double m90 = calc.getMEAN90();

+          double dm90 = m90 - Eevt[iE];

           int ent = thisc.entries();
           double m = thisc.mean();
           double r = thisc.rms();

@@ -186,7 +187,7 @@

           dp.coordinate(0).setValue(ZE);
           dp2.coordinate(0).setValue(ZE);
           dp.coordinate(1).setValue(dEoE);

-          dp2.coordinate(1).setValue(m90);

+          dp2.coordinate(1).setValue(dm90);

           dp.coordinate(1).setErrorPlus(err);
           dp.coordinate(1).setErrorMinus(err);
           dp2.coordinate(1).setErrorPlus(err2);

@@ -197,6 +198,7 @@

              thisc = aida.cloud1D(rname);
              r90 = calc.calculateRMS90(thisc);
              m90 = calc.getMEAN90();

+             dm90 = m90 - Eevt[iE];

              ent = thisc.entries();
              m = thisc.mean();
              r = thisc.rms();

@@ -210,7 +212,7 @@

              dp.coordinate(0).setValue(phiv[i]);
              dp2.coordinate(0).setValue(phiv[i]);
              dp.coordinate(1).setValue(dEoE);

-             dp2.coordinate(1).setValue(m90);

+             dp2.coordinate(1).setValue(dm90);

              dp.coordinate(1).setErrorPlus(err);
              dp.coordinate(1).setErrorMinus(err);
              dp2.coordinate(1).setErrorPlus(err2);

lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/analysis

diff -u -r1.1 -r1.2
--- QqbarBarrelPhiAnalysisDriver.java	5 Aug 2010 18:37:17 -0000	1.1
+++ QqbarBarrelPhiAnalysisDriver.java	10 Aug 2010 21:50:13 -0000	1.2
@@ -162,16 +162,17 @@

       IDataPointSet dpsM;
       IDataPointSet[] dpsM2 = new IDataPointSet[nE];
       dpsE = dpsf.create("dE over E vs cmE","dEoE vs E",2);

-      dpsM = dpsf.create("mean90 vs cmE","m90 vs E",2);

+      dpsM = dpsf.create("dmean90 vs cmE","dm90 vs E",2);

       for(int iE=0;iE<nE;iE++)
       {
          dpsE2[iE] = dpsf.create("E="+Eevt[iE]+":dE over E vs phibin","Ecm="+Eevt[iE]+":dEoE vs phi",2);

-         dpsM2[iE] = dpsf.create("E="+Eevt[iE]+":mean90 vs phibin","Ecm="+Eevt[iE]+":m90 vs phi",2);

+         dpsM2[iE] = dpsf.create("E="+Eevt[iE]+":dmean90 vs phibin","Ecm="+Eevt[iE]+":dm90 vs phi",2);

          ZE = Eevt[iE];
          String rname = "cmE="+Eevt[iE]+"/Event Energy";
           ICloud1D thisc = aida.cloud1D(rname);
           double r90 = calc.calculateRMS90(thisc);
           double m90 = calc.getMEAN90();

+          double dm90 = m90 - Eevt[iE];

           int ent = thisc.entries();
           double m = thisc.mean();
           double r = thisc.rms();

@@ -185,7 +186,7 @@

           dp.coordinate(0).setValue(ZE);
           dp2.coordinate(0).setValue(ZE);
           dp.coordinate(1).setValue(dEoE);

-          dp2.coordinate(1).setValue(m90);

+          dp2.coordinate(1).setValue(dm90);

           dp.coordinate(1).setErrorPlus(err);
           dp.coordinate(1).setErrorMinus(err);
           dp2.coordinate(1).setErrorPlus(err2);

@@ -196,6 +197,7 @@

              thisc = aida.cloud1D(rname);
              r90 = calc.calculateRMS90(thisc);
              m90 = calc.getMEAN90();

+             dm90 = m90 - Eevt[iE];

              ent = thisc.entries();
              m = thisc.mean();
              r = thisc.rms();

@@ -209,7 +211,7 @@

              dp.coordinate(0).setValue(phiv[i]);
              dp2.coordinate(0).setValue(phiv[i]);
              dp.coordinate(1).setValue(dEoE);

-             dp2.coordinate(1).setValue(m90);

+             dp2.coordinate(1).setValue(dm90);

              dp.coordinate(1).setErrorPlus(err);
              dp.coordinate(1).setErrorMinus(err);
              dp2.coordinate(1).setErrorPlus(err2);