1)loose the fitting condition; 2) change the fitting fuc of ATOF time to be range dynamic

Author: zhiwanxu

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_time.groovy

@@ -20,9 +20,11 @@ def has_data = new AtomicBoolean(false)
     (0..<11).collect{component->
       def h1 = dir.getObject(String.format('/ALERT/ATOF_Time_component%02d', component))
       if(h1!=null) {
-        if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries()>300){
+        if (h1.getBinContent(h1.getMaximumBin()) > 3 && h1.getEntries()>10){
           data[run].put(String.format('atof_time_%02d', component),  h1)
-          def f1 = ALERTFitter.atof_time_fitter(h1,component)
+          double fit_min = h1.getXaxis().getBinCenter(1)
+          double fit_max = h1.getXaxis().getBinCenter(h1.getXaxis().getNBins())
+          def f1 = ALERTFitter.atof_time_fitter(h1, component, fit_min, fit_max)
           data[run].put(String.format('fit_atof_time_%02d', component),  f1)
           data[run].put(String.format('peak_location_atof_time_%02d', component),  f1.getParameter(1))
           data[run].put(String.format('sigma_atof_time_%02d', component),  f1.getParameter(2).abs())

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_time_sl.groovy

@@ -26,10 +26,12 @@ class alert_atof_time_sl {
     (0..<11).each { component ->
       def h1 = dir.getObject(String.format('/ALERT/ATOF_Time_sector%02d_layer%02d_component%02d', sector, layer, component))
       if (h1 != null) {
-        if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries() > 300) {
+        if (h1.getBinContent(h1.getMaximumBin()) > 3 && h1.getEntries() > 10) {
           def name = String.format('atof_time_sl_s%02d_l%d_c%02d', sector, layer, component)
           data[run].put(name, h1)
-          def f1 = ALERTFitter.atof_time_fitter(h1, component)
+          double fit_min = h1.getXaxis().getBinCenter(1)
+          double fit_max = h1.getXaxis().getBinCenter(h1.getXaxis().getNBins())
+          def f1 = ALERTFitter.atof_time_fitter(h1, component, fit_min, fit_max)
           data[run].put('fit_' + name, f1)
           data[run].put('peak_location_' + name, f1.getParameter(1))
           data[run].put('sigma_' + name, f1.getParameter(2).abs())

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_z.groovy

@@ -13,7 +13,7 @@ class alert_atof_z {
     data[run] = [run:run]
     def h1 = dir.getObject('/ALERT/ATOF_z_combined')
     if (h1 != null) {
-      if (h1.getEntries() > 300) {
+      if (h1.getEntries() > 10) {
         data[run].put('atof_z_combined', h1)
         data[run].put('rms_atof_z_combined', h1.getRMS())
         has_data.set(true)

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_z_c4.groovy

@@ -14,7 +14,7 @@ class alert_atof_z_c4 {
     data[run] = [run:run]
     def h1 = dir.getObject('/ALERT/ATOF_z_combined_c4')
     if (h1 != null) {
-      if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries() > 300) {
+      if (h1.getBinContent(h1.getMaximumBin()) > 3 && h1.getEntries() > 10) {
         data[run].put('atof_z_c4_combined', h1)
         def f1 = ALERTFitter.atof_z_fitter(h1)
         data[run].put('fit_atof_z_c4_combined', f1)

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_z_c4_sl.groovy

@@ -25,7 +25,7 @@ class alert_atof_z_c4_sl {
     data[run] = [run:run]
     def h1 = dir.getObject(String.format('/ALERT/ATOF_z_c4_sector%02d_layer%02d', sector, layer))
     if (h1 != null) {
-      if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries() > 300) {
+      if (h1.getBinContent(h1.getMaximumBin()) > 3 && h1.getEntries() > 10) {
         def name = String.format('atof_z_c4_sl_s%02d_l%d', sector, layer)
         data[run].put(name, h1)
         def f1 = ALERTFitter.atof_z_fitter(h1)

src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_z_sl.groovy

@@ -24,7 +24,7 @@ class alert_atof_z_sl {
     data[run] = [run:run]
     def h1 = dir.getObject(String.format('/ALERT/ATOF_z_sector%02d_layer%02d', sector, layer))
     if (h1 != null) {
-      if (h1.getEntries() > 300) {
+      if (h1.getEntries() > 10) {
         def name = String.format('atof_z_sl_s%02d_l%d', sector, layer)
         data[run].put(name, h1)
         data[run].put('rms_' + name, h1.getRMS())

src/main/java/org/jlab/clas/timeline/fitter/ALERTFitter.groovy

@@ -34,9 +34,9 @@ class ALERTFitter{
   }
 
 
-	static F1D atof_time_fitter(H1F h1, int component){
+	static F1D atof_time_fitter(H1F h1, int component, double fit_min, double fit_max){
 		if(component>9){//bars
-			def f1 =new F1D("fit:"+h1.getName(),"[amp]*gaus(x,[mean],[sigma])+[cst]", -5.0, 5.0);
+			def f1 =new F1D("fit:"+h1.getName(),"[amp]*gaus(x,[mean],[sigma])+[cst]", fit_min, fit_max);
 			f1.setLineColor(33);
 			f1.setLineWidth(10);
 			f1.setOptStat("1111");
@@ -185,10 +185,10 @@ class ALERTFitter{
 	static F1D atof_z_fitter(H1F h1){
 		double maxz = h1.getBinContent(h1.getMaximumBin())
 		double peak = h1.getAxis().getBinCenter(h1.getMaximumBin())
-		int bin_low  = h1.getAxis().getBin(peak - 5.0)
-		int bin_high = h1.getAxis().getBin(peak + 5.0)
+		int bin_low  = h1.getAxis().getBin(peak - 10.0)
+		int bin_high = h1.getAxis().getBin(peak + 10.0)
 		double sigma = ALERTFitter.getRestrictedRMS(h1, bin_low, bin_high)
-		if (sigma <= 0 || Double.isNaN(sigma)) sigma = 3.0
+		if (sigma <= 0 || Double.isNaN(sigma)) sigma = 5.0
 
 		def f1 = new F1D("fit:" + h1.getName(), "[amp]*gaus(x,[mean],[sigma])", peak - 2*sigma, peak + 2*sigma)
 		f1.setLineColor(33)
@@ -199,7 +199,7 @@ class ALERTFitter{
 		f1.setParameter(2, sigma)
 		if (maxz > 0) f1.setParLimits(0, maxz * 0.5, maxz * 1.5)
 		f1.setParLimits(1, peak - 5.0, peak + 5.0)
-		f1.setParLimits(2, 0.1, 10.0)
+		f1.setParLimits(2, 0.01, 10.0)
 
 		PrintStream original = System.out
 		System.setOut(new PrintStream(OutputStream.nullOutputStream()))