Anylyzer: Pegasus adjustments: fixed human readable string generation

diff --git a/MABS_run_analyzer/MAPS.c b/MABS_run_analyzer/MAPS.c
index e5a32bfb0ca55ae094dad0b39567c2242325f116..230e22f27459367c547388d20bff5bf7d63f6d40 100644 (file)
--- a/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@ -165,10 +165,10 @@ void MAPS::save() {
     if(fSave && fOk)
     {
         cout<<"----------------------------------------------------------------"<<endl;
-        cout << "  Frames with suspicious pedestial value: " << fPedestalhighFrames << " out of " << fEventsSum << " (" << (1.0*fPedestalhighFrames/fEventsSum*100) << " %%)" << endl;
-        cout << "  Pixel with suspicious pedestial value: " << fPedestalhighPixel << " out of " << fEventsSum*fPixels<< " (" << (1.0*fPedestalhighPixel/(fEventsSum*fPixels)*100) << " %%)" << endl;
-        cout << "  Frames with suspicious noise value: " << fNoiseHighFrames << " out of " << fEventsSum << " (" << (1.0*fNoiseHighFrames/fEventsSum*100) << " %%)" << endl;
-        cout << "  Pixel with suspicious pedestial value: " << fNoiseHighPixel << " out of " << fEventsSum*fPixels<< " (" << (1.0*fNoiseHighPixel/(fEventsSum*fPixels)*100) << " %%)" << endl;
+        cout << "  Frames with suspicious pedestial value: " << std::cout.width(10)<< std::right << fPedestalhighFrames << " out of " << fEventsSum << " (" << (1.0*fPedestalhighFrames/fEventsSum*100) << " %)" << endl;
+        cout << "  Pixel with suspicious pedestial value: " << std::cout.width(10) << std::right << fPedestalhighPixel << " out of " << fEventsSum*fPixels<< " (" << (1.0*fPedestalhighPixel/(fEventsSum*fPixels)*100) << " %)" << endl;
+        cout << "  Frames with suspicious noise value: " << std::cout.width(10) << std::right<< fNoiseHighFrames << " out of " << fEventsSum << " (" << (1.0*fNoiseHighFrames/fEventsSum*100) << " %)" << endl;
+        cout << "  Pixel with suspicious pedestial value: " << std::cout.width(10) << std::right << fNoiseHighPixel << " out of " << fEventsSum*fPixels<< " (" << (1.0*fNoiseHighPixel/(fEventsSum*fPixels)*100) << " %)" << endl;
         cout<<"----------------------------------------------------------------"<<endl;
         
         fOutputFile->cd();

diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index ae515ba07d47197453eb4852c794b60569df0ee7..837bffa4f2384d97c9b88f32867ce6daab66bdf9 100644 (file)
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -84,7 +84,7 @@ Run::Run(Int_t runnumber, Int_t loopi)
 //                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("S:","/home/blinnik/garlic/local");
 //                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("s:","/home/blinnik/garlic/local");
                 storepathRAWLinux = storepathRAWLinux.ReplaceAll("\\","/");
-            }
+            } else storepathRAWLinux=Form("/d/garlic/pegasus/%d",runnumber); // default empty path, for pegasus
             savepathresults = storepathRAWLinux;
             labbook.chipGen = (rowsql->GetField(9) != NULL)?std::string(rowsql->GetField(9)):"";
             labbook.posVetoDB = (rowsql->GetField(10) != NULL)?atoi(rowsql->GetField(10)):-1;
@@ -99,7 +99,7 @@ Run::Run(Int_t runnumber, Int_t loopi)
             delete res;
             if (labbook.chip.Length() > 0 && labbook.chipGen.Length() > 0) // versuche infos zum Chip aus der ChipDatenbank zu bekommen
             {
-                selectquery=prepareSQLStatement("select `epi_thickness`, `resistivity`, `ChipRadiation Ion`, `ChipRadiation NonIon` from `radhard`.`chips` WHERE `no`='" + numberToString<>(labbook.chip) + "' AND `chipgen`='" + numberToString<>(labbook.chipGen) + "'");
+                selectquery=prepareSQLStatement("select `epi_thickness`, `resistivity`, `ChipRadiation Ion`, `ChipRadiation NonIon` from `radhard`.`chips` WHERE `no`='" + numberToString<>(labbook.chip) + "' AND `chipgen`='" + labbook.chipGen + "'");
                 res = db->Query(selectquery.c_str());
                 nrows = res->GetRowCount();
                 if (nrows > 0)
@@ -1251,7 +1251,7 @@ void Run::initHistograms(histogramstruct* histogramstructpointer, TString suffix
     initHistogram(histogramstructpointer->Veto, "Veto" + suffix);
     
     TString prefix = "Noise" + suffix;
-    TString humanreadablestr = Form("%s, %s spectrum, Mi%s, chip %s, %s, T=%.1f",prefix.Data(), labbook.source.Data(), labbook.chipGen.Data(), labbook.chip.Data(), labbook.matrix.Data(), labbook.temp);
+    TString humanreadablestr = Form("%s, %s spectrum, %s, chip %s, %s, T=%.1f",prefix.Data(), labbook.source.Data(), labbook.chipGen.Data(), labbook.chip.Data(), labbook.matrix.Data(), labbook.temp);
     if (suffix.Contains("threshold"))
     {
         histogramstructpointer->thresholdcluster = 1;
@@ -1274,7 +1274,7 @@ void Run::initHistograms(histogramstruct* histogramstructpointer, TString suffix
 
 void Run::initHistogram(TH1F* &histogrampointer, TString prefix)
 {
-    TString humanreadablestr = Form("%s, %s spectrum, Mi%s, chip %s, %s, T=%.1f",prefix.Data(), labbook.source.Data(), labbook.chipGen.Data(), labbook.chip.Data(), labbook.matrix.Data(), labbook.temp);
+    TString humanreadablestr = Form("%s, %s spectrum, %s, chip %s, %s, T=%.1f",prefix.Data(), labbook.source.Data(), labbook.chipGen.Data(), labbook.chip.Data(), labbook.matrix.Data(), labbook.temp);
     histogrampointer=new TH1F(prefix.Data(), humanreadablestr.Data(), systemparamcur.nbins, 0, systemparamcur.maxbin);  
     histogrampointer->SetLineStyle(rootlinestyle[plotStyle]);
     histogrampointer->SetLineColor(rootcolors[plotStyle]);