lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
diff -u -r1.3 -r1.4
--- DRFunctionFactory.java 30 Dec 2009 20:04:55 -0000 1.3
+++ DRFunctionFactory.java 31 Dec 2009 22:27:39 -0000 1.4
@@ -89,11 +89,22 @@
mp.put(dualcor, al);
al = new ArrayList<IFunction>();
dualcor = new DetectorConfiguration("ccal02", "BGO", 15., 1.65, "Digis", 0.02, 0.02, "LCPhys");
- Corfu = functionFactory.createFunctionByName("ccal02_digis_LCPhys_d15", "p3");
- Corfu.setParameter("p0", 0.59275);
- Corfu.setParameter("p1", -0.063934);
- Corfu.setParameter("p2", 0.46452);
- Corfu.setParameter("p3", -0.025751);
+ Corfu = functionFactory.createFunctionByName("ccal02_digis_LCPhys_d15", "p4");
+ //Corfu.setParameter("p0", 0.51470);
+ //Corfu.setParameter("p1", 0.48233);
+ //Corfu.setParameter("p2", -0.57546);
+ //Corfu.setParameter("p3", 0.53035);
+ //Corfu.setParameter("p4", 0.030363);
+ //Corfu.setParameter("p0", 0.51127);
+ //Corfu.setParameter("p1", 0.49477);
+ //Corfu.setParameter("p2", -0.5600);
+ //Corfu.setParameter("p3", 0.53095);
+ //Corfu.setParameter("p4", 6.4164e-3);
+ Corfu.setParameter("p0", 0.52763);
+ Corfu.setParameter("p1", 0.44654);
+ Corfu.setParameter("p2", -0.60636);
+ Corfu.setParameter("p3", 0.54437);
+ Corfu.setParameter("p4", 0.10977);
al.add(Corfu);
// adding or set elements in Map by put method key and value pair
Cerfu = functionFactory.createFunctionByName("cc_ccal02_digis_LCPhys_d15", "p1");
@@ -152,6 +163,11 @@
ArrayList<IFunction> map = (ArrayList<IFunction>) mp.get(dc);
refunc = (IFunction) map.get(0);
}
+ int n = refunc.parameters().length;
+ System.out.println("dcfunc");
+ for (int j = 0; j < n; j++) {
+ System.out.println(refunc.parameters()[j]);
+ }
return refunc;
}
// get cerenkov scale
lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
diff -u -r1.3 -r1.4
--- DRResolutionDriver.java 24 Dec 2009 14:43:25 -0000 1.3
+++ DRResolutionDriver.java 31 Dec 2009 22:27:39 -0000 1.4
@@ -29,9 +29,7 @@
private String PhysicsList = "LCPhys";
String AIDAFile = null;
String file_name = null;
- DualCorrection dual;
CSClusdMJetDriver digi;
-
Resolution resol;
public DRResolutionDriver() {
@@ -41,7 +39,8 @@
resol = new Resolution();
add(resol);
}
- @Override
+
+ @Override
public void startOfData() {
System.out.println("DRCalibrationDriver:startOfData");
System.out.println(AIDAFile);
@@ -57,6 +56,14 @@
System.err.println("DRCalibrationDriver: file_name variable must be set");
System.exit(1); // exit if variable is not set
}
+ resol.setMyPhysicsList(PhysicsList);
+ resol.setMyDetector(Detector);
+ resol.setMyMaterial(Material);
+ resol.setMyDensity(Density);
+ resol.setMyrindex(rindex);
+ resol.setMyCollectionName(CollectionName);
+ resol.setMyCerenkovThres(CerenkovThres);
+ resol.setMyIonizationThres(IonizationThres);
resol.startOfData();
}
lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
diff -u -r1.11 -r1.12
--- DualCorrection.java 24 Dec 2009 14:43:25 -0000 1.11
+++ DualCorrection.java 31 Dec 2009 22:27:39 -0000 1.12
@@ -323,7 +323,7 @@
conv_slices[i] = slices[i].histogram();
}
int entries = conv_slices[i].entries();
- if (entries > 100) {
+ if (entries > 300) {
for (int ii = 0; ii < Fitters.length; ii++) {
System.out.println("Fitter: " + Fitters[ii]);
gauss.setParameter("amplitude", conv_slices[i].maxBinHeight());