Run analyzer: label corrections

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index 9029615ef043f250b49e077e1d6c32bc634d410a..c02941d0aa7100e61ad39a572a705c98b1cfaf74 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -133,38 +133,9 @@ void ChargeSpektrum(TString runnumber = "")
                 if (!runs[runi]->error)
                 {
             //         gROOT->SetBatch(kTRUE);
-                    //           runs[runi]->plotSeed();
-
-//                     runs[runi]->plotSeedThresholdCalibrated();
-//                     runs[runi]->plotSeedThreshold();
-//                     runs[runi]->plotSeed();
-            //         runs[runi]->plotSum();
-            //         runs[runi]->plotVeto();
-                    //         runs[runi]->plotNoise();
                     if (!isBatch)
                         gROOT->SetBatch(kFALSE);
-                    runs[runi]->compareHistogramClassVector.push_back(runs[runi]->histogram->calibrated);
-                    runs[runi]->compareHistogramClassVector.push_back(runs[runi]->histogramthreshold->calibrated);
-                    runs[runi]->compareHistogramClassVector.push_back(runs[runi]->dennismegacut->calibrated);
-                    runs[runi]->compareHistogramClassVector.push_back(runs[runi]->histogramfixedthreshold->calibrated);
-                    runs[runi]->plotCompareHistograms();
-                    runs[runi]->plotAllHistograms(runs[runi]->histogram->calibrated);
-                    runs[runi]->plotAllHistograms(runs[runi]->dennismegacut->calibrated);
-                    runs[runi]->plot1DHistogram(runs[runi]->histogram->calibrated, runs[runi]->histogram->Seed, "landau");
                     runs[runi]->plot1DHistogram(runs[runi]->histogram->calibrated, runs[runi]->histogram->calibrated->Seed, "landau");
-                    compareHistogramClassVector.push_back(runs[runi]->histogram->calibrated);
-                    compareHistogramVector.push_back(runs[runi]->histogram->Seed);
-//                     runs[runi]->integrateSr90Spectra(&runs[runi]->histogramfixedthresholdCalibrated, runs[runi]->histogramfixedthresholdCalibrated.Seed, 0); 
-//                     runs[runi]->plot1DHistogram(&runs[runi]->histogramfixedthresholdCalibrated, runs[runi]->histogramfixedthresholdCalibrated.Seed, "landau");
-//                     runs[runi]->plot1DHistogram(&runs[runi]->histogramthresholdCalibrated, runs[runi]->histogramthresholdCalibrated.Seed, "landau");
-//                     runs[runi]->plotAllHistograms(&runs[runi]->histogramfixedthreshold);
-//                     runs[runi]->plotAllHistograms();
-//                     runs[runi]->plotAllHistograms();
-//                     runs[runi]->plotAllHistogramsThresholdCluster();                    
-//                     runs[runi]->plotAllHistogramsThresholdClusterCalibrated();
-//                     runs[runi]->plotClusterDistribution(&runs[runi]->histogramthresholdCalibrated);
-
-//                      runs[runi]->plotAllHistogramsCalibrated(); 
                     runs[runi]->writeAllHistogramsToFile(); 
                 }
             }

diff --git a/MABS_run_analyzer/ChargeSpektrumFunctions.c b/MABS_run_analyzer/ChargeSpektrumFunctions.c
index eabe580ee3847a0ce02462c23d27856d1b36da1c..abb3399f7e0715e19621c2b56ec39fba5cc0518c 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrumFunctions.c
+++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c
@@ -89,7 +89,7 @@ Bool_t writeObservableToFile()
                 if (!runs[runi]->error)
                 {
                     filename+= Form("_%d",runs[runi]->labbook.runnumber);
-                    header  += Form("#%s %lu frames\n", runs[runi]->runcode.Data(), runs[runi]->frames_found);
+                    header  += Form("#%s, %lu frames\n", runs[runi]->runcode.Data(), runs[runi]->frames_found);
                 }
             }
         }

diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index ecb0af7d513db43a54bec2ba97da459ea675007e..19edd699220b15d7575937887276f19d1082a455 100644 (file)
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -1378,11 +1378,11 @@ void Run::plotVerticalLine(TH1F* histogrampointer, Float_t xVal) {
         l->Draw("same"); 
 
         TString  legendEntry = TString(Form("peak position: %.1f",xVal ));
-        TLegend* leg = new TLegend(0.5,0.8,0.6,0.89);//(0.6,0.7,0.89,0.89);
+        TLegend* leg = new TLegend(0.65,0.65,0.80,0.80);//(0.6,0.7,0.89,0.89);
         leg->SetFillColor(0);
         leg->SetBorderSize(0);
         leg->AddEntry((TObject*) 0, legendEntry, "");
-        leg->SetTextSize(0.03);
+        leg->SetTextSize(0.025);
         leg->Draw();
     }
 }
@@ -1401,7 +1401,7 @@ TCanvas* Run::plot1DHistogram(HistogramType* HistogramTypepointer, TH1F* onehist
         onehistogram->Draw();
         Float_t maxValue = HistogramTypepointer->FitPerform(onehistogram, fitFuncType);
         plotVerticalLine(onehistogram, maxValue);
-        TLegend* leg = new TLegend(0.8,0.8,0.89,0.89);//(0.6,0.7,0.89,0.89);
+        TLegend* leg = new TLegend(0.4,0.8,0.89,0.89);//(0.6,0.7,0.89,0.89);
         leg->SetFillColor(0);
         leg->SetBorderSize(0);
         if (legendstr.Length() < 1)