lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/analysis
diff -u -r1.2 -r1.3
--- QqbarBarrelPhiNonprojAnalysisDriver.java 10 Aug 2010 21:50:13 -0000 1.2
+++ QqbarBarrelPhiNonprojAnalysisDriver.java 12 Aug 2010 15:42:01 -0000 1.3
@@ -162,12 +162,16 @@
IDataPointSet[] dpsE2 = new IDataPointSet[nE];
IDataPointSet dpsM;
IDataPointSet[] dpsM2 = new IDataPointSet[nE];
+ IDataPointSet dpsMp;
+ IDataPointSet[] dpsMp2 = new IDataPointSet[nE];
dpsE = dpsf.create("dE over E vs cmE","dEoE vs E",2);
dpsM = dpsf.create("dmean90 vs cmE","dm90 vs E",2);
+ dpsMp = 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]+":dmean90 vs phibin","Ecm="+Eevt[iE]+":dm90 vs phi",2);
+ dpsMp2[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);
@@ -182,16 +186,22 @@
double err = (1.1*r90/Math.sqrt(1.8*ent))/(m90);
dpsE.addPoint();
dpsM.addPoint();
+ dpsMp.addPoint();
IDataPoint dp = dpsE.point(iE);
IDataPoint dp2 = dpsM.point(iE);
+ IDataPoint dp2p = dpsMp.point(iE);
dp.coordinate(0).setValue(ZE);
dp2.coordinate(0).setValue(ZE);
+ dp2p.coordinate(0).setValue(ZE);
dp.coordinate(1).setValue(dEoE);
dp2.coordinate(1).setValue(dm90);
+ dp2p.coordinate(1).setValue(dm90/Eevt[iE]);
dp.coordinate(1).setErrorPlus(err);
dp.coordinate(1).setErrorMinus(err);
dp2.coordinate(1).setErrorPlus(err2);
dp2.coordinate(1).setErrorMinus(err2);
+ dp2p.coordinate(1).setErrorPlus(err2/Eevt[iE]);
+ dp2p.coordinate(1).setErrorMinus(err2/Eevt[iE]);
for(int i=0;i<phil.length;i++)
{
rname = "cmE="+Eevt[iE]+"/phibin "+i+"/Event Energy";
@@ -207,16 +217,22 @@
err = (1.1*r90/Math.sqrt(1.8*ent))/(m90);
dpsE2[iE].addPoint();
dpsM2[iE].addPoint();
+ dpsMp2[iE].addPoint();
dp = dpsE2[iE].point(i);
dp2 = dpsM2[iE].point(i);
+ dp2p = dpsMp2[iE].point(i);
dp.coordinate(0).setValue(phiv[i]);
dp2.coordinate(0).setValue(phiv[i]);
+ dp2p.coordinate(0).setValue(phiv[i]);
dp.coordinate(1).setValue(dEoE);
dp2.coordinate(1).setValue(dm90);
+ dp2p.coordinate(1).setValue(dm90/Eevt[iE]);
dp.coordinate(1).setErrorPlus(err);
dp.coordinate(1).setErrorMinus(err);
dp2.coordinate(1).setErrorPlus(err2);
dp2.coordinate(1).setErrorMinus(err2);
+ dp2p.coordinate(1).setErrorPlus(err2/Eevt[iE]);
+ dp2p.coordinate(1).setErrorMinus(err2/Eevt[iE]);
}
}
super.suspend();
lcsim-contrib/src/main/java/org/lcsim/contrib/Cassell/recon/analysis
diff -u -r1.2 -r1.3
--- QqbarBarrelPhiAnalysisDriver.java 10 Aug 2010 21:50:13 -0000 1.2
+++ QqbarBarrelPhiAnalysisDriver.java 12 Aug 2010 15:42:01 -0000 1.3
@@ -161,12 +161,16 @@
IDataPointSet[] dpsE2 = new IDataPointSet[nE];
IDataPointSet dpsM;
IDataPointSet[] dpsM2 = new IDataPointSet[nE];
+ IDataPointSet dpsMp;
+ IDataPointSet[] dpsMp2 = new IDataPointSet[nE];
dpsE = dpsf.create("dE over E vs cmE","dEoE vs E",2);
dpsM = dpsf.create("dmean90 vs cmE","dm90 vs E",2);
+ dpsMp = 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]+":dmean90 vs phibin","Ecm="+Eevt[iE]+":dm90 vs phi",2);
+ dpsMp2[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);
@@ -181,16 +185,22 @@
double err = (1.1*r90/Math.sqrt(1.8*ent))/(m90);
dpsE.addPoint();
dpsM.addPoint();
+ dpsMp.addPoint();
IDataPoint dp = dpsE.point(iE);
IDataPoint dp2 = dpsM.point(iE);
+ IDataPoint dp2p = dpsMp.point(iE);
dp.coordinate(0).setValue(ZE);
dp2.coordinate(0).setValue(ZE);
+ dp2p.coordinate(0).setValue(ZE);
dp.coordinate(1).setValue(dEoE);
dp2.coordinate(1).setValue(dm90);
+ dp2p.coordinate(1).setValue(dm90/Eevt[iE]);
dp.coordinate(1).setErrorPlus(err);
dp.coordinate(1).setErrorMinus(err);
dp2.coordinate(1).setErrorPlus(err2);
dp2.coordinate(1).setErrorMinus(err2);
+ dp2p.coordinate(1).setErrorPlus(err2/Eevt[iE]);
+ dp2p.coordinate(1).setErrorMinus(err2/Eevt[iE]);
for(int i=0;i<phil.length;i++)
{
rname = "cmE="+Eevt[iE]+"/phibin "+i+"/Event Energy";
@@ -206,16 +216,22 @@
err = (1.1*r90/Math.sqrt(1.8*ent))/(m90);
dpsE2[iE].addPoint();
dpsM2[iE].addPoint();
+ dpsMp2[iE].addPoint();
dp = dpsE2[iE].point(i);
dp2 = dpsM2[iE].point(i);
+ dp2p = dpsMp2[iE].point(i);
dp.coordinate(0).setValue(phiv[i]);
dp2.coordinate(0).setValue(phiv[i]);
+ dp2p.coordinate(0).setValue(phiv[i]);
dp.coordinate(1).setValue(dEoE);
dp2.coordinate(1).setValue(dm90);
+ dp2p.coordinate(1).setValue(dm90/Eevt[iE]);
dp.coordinate(1).setErrorPlus(err);
dp.coordinate(1).setErrorMinus(err);
dp2.coordinate(1).setErrorPlus(err2);
dp2.coordinate(1).setErrorMinus(err2);
+ dp2p.coordinate(1).setErrorPlus(err2/Eevt[iE]);
+ dp2p.coordinate(1).setErrorMinus(err2/Eevt[iE]);
}
}
super.suspend();