Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection on MAIN
DualCorrection.java+9-71.8 -> 1.9


lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
DualCorrection.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- DualCorrection.java	16 Dec 2009 22:43:37 -0000	1.8
+++ DualCorrection.java	17 Dec 2009 21:02:12 -0000	1.9
@@ -39,7 +39,6 @@
     private AIDA aida = AIDA.defaultInstance();
     String AIDAFile;
     String file_name;
-    double Gun_radius;
     FileWriter fstream;
     BufferedWriter out;
     IFunctionFactory functionFactory;
@@ -72,11 +71,14 @@
     int point_cerene[];
     double[] result;
     double errors[];
-    String[] Fitters = {"Chi2", "leastsquares", "bml", "cleverchi2"};
+
+    String[] Fitters = {"Chi2", "leastsquares"};
+     // Available are: "Chi2", "leastsquares", "bml", "cleverchi2";
+    //            but bml and cleverchi2 results don't make too much sense
     IFitter jminuit;
     IFitResult jminuitResult;
-    IFunction E_cor;
-    IFunction C_cor;
+    IFunction E_cor;                // electron Ionisation correction function
+    IFunction C_cor;                // electron cerenkov correction function
     double xval[] = {10.};
     double binwidth = 0.04;
     int maxbin = (int) Math.rint(1.0 / binwidth);
@@ -112,9 +114,9 @@
         } else {
             System.exit(0);
         }
-        aida.profile1D("ratio", 20, 0.4, 1.);
+//        aida.profile1D("ratio", 20, 0.4, 1.);
         dlength = aida.histogramFactory().createCloud1D("dlength", "decay length combined ", 500000, "autoConvert = false");
-        prof_combined = aida.histogramFactory().createProfile1D("ratio", "ratio combined", 20, 0.4, 1.);
+        prof_combined = aida.histogramFactory().createProfile1D("ratio_comb", "ratio combined", 20, 0.4, 1.);
         c_efrac_ratio = aida.histogramFactory().createCloud2D("c_efrac_ratio", "c_efrac_ratio combined ", 500000, "autoConvert = false");
         slice_comb = new ICloud1D[maxbin + 2];
         conv_slice_comb = new IHistogram1D[maxbin + 2];
@@ -244,7 +246,7 @@
     @Override
     protected void endOfData() {
         System.out.println("End of Data:");
-        fitprofile(aida.profile1D("ratio"));
+//        fitprofile(aida.profile1D("ratio"));
         convertandfit(slice, conv_slice);
         aida.tree().cd("/");
         fitprofile(prof_combined);
CVSspam 0.2.8