lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
diff -u -r1.4 -r1.5
--- DRFunctionFactory.java 31 Dec 2009 22:27:39 -0000 1.4
+++ DRFunctionFactory.java 7 May 2010 21:05:04 -0000 1.5
@@ -116,6 +116,25 @@
efu.setParameter("p1", 1.0033);
al.add(efu);
mp.put(dualcor, al);
+ al = new ArrayList<IFunction>();
+ dualcor = new DetectorConfiguration("ccal02", "BGO", 15., 2.15, "Digis", 0.02, 0.02, "BGSP_BERT");
+ Corfu = functionFactory.createFunctionByName("ccal02_digis_LCPhys_d15_215", "p4");
+ Corfu.setParameter("p0", 0.57877);
+ Corfu.setParameter("p1", 0.54309);
+ Corfu.setParameter("p2", -0.57078);
+ Corfu.setParameter("p3", 0.46416);
+ Corfu.setParameter("p4", -0.10309);
+ al.add(Corfu);
+ // adding or set elements in Map by put method key and value pair
+ Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_LCPhys_d15_215", "p1");
+ Cerfu.setParameter("p0", 5.8230e-3);
+ Cerfu.setParameter("p1", 12653.);
+ al.add(Cerfu);
+ efu = functionFactory.createFunctionByName("ec_ccal02_digis_LCPhys_d15_215", "p1");
+ efu.setParameter("p0", 1.7141e-3);
+ efu.setParameter("p1", 1.0025);
+ al.add(efu);
+ mp.put(dualcor, al);
}
public void print() {
lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
diff -u -r1.5 -r1.6
--- ElectronCorrection.java 10 Dec 2009 17:41:37 -0000 1.5
+++ ElectronCorrection.java 7 May 2010 21:05:04 -0000 1.6
@@ -248,7 +248,7 @@
point++;
// chi 2 fit:
System.out.println("chi2 fit:");
- jminuit = fitFactory.createFitter("Chi2", "jminuit");
+ /*jminuit = fitFactory.createFitter("Chi2", "jminuit");
jminuitResult = jminuit.fit(Edep_conv, gauss);
System.out.println(Edep_conv.maxBinHeight() + " , " + Edep_conv.mean() + " , " + Edep_conv.rms());
System.out.println("jminuit Chi2=" + jminuitResult.quality());
@@ -267,6 +267,7 @@
double[] resultls = jminuitResultls.fittedParameters();
functionFactory.cloneFunction("fitted gauss (jminuitls)", jminuitResultls.fittedFunction());
System.out.println(resultls[0] + "," + resultls[1] + "," + resultls[2]);
+*/
//
// now deal with cerenkov response:
//