Index: trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C (revision 8938) +++ trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C (revision 8940) @@ -119,4 +119,5 @@ } + MHCamera *cal = (MHCamera*)arr.FindObjectInCanvas("CalPos;avg", "MHCamera", "CalPos"); MHCamera *pul = (MHCamera*)arr.FindObjectInCanvas("PulsePos;avg", "MHCamera", "PulsePos"); if (!pul) @@ -220,4 +221,6 @@ TString meansiginner =Form("%6.2f", meansigi); TString meansigouter =Form("%6.2f", meansigo); + + TString calpos = cal ? Form("%5.1f", cal->GetMean()) : "NULL"; if (pul->GetMean()<0 || pul->GetRMS()<0) @@ -300,17 +303,14 @@ Int_t nx = htp->GetNbinsX(); - rateped = Form("%8.1f", iped <0 ? 0 : htp->Integral(1, nx, iped, iped) / nx); - rateped2 = Form("%7.2f", iped2<0 ? 0 : htp->Integral(1, nx, iped2, iped2) / nx); - ratecal = Form("%8.1f", ical <0 ? 0 : htp->Integral(1, nx, ical, ical) / nx); - ratetrig = Form("%8.1f", itrig<0 ? 0 : htp->Integral(1, nx, itrig, itrig) / nx); - ratesum = Form("%8.1f", isum <0 ? 0 : htp->Integral(1, nx, isum, isum) / nx); - ratenull = Form("%8.1f", inull<0 ? 0 : htp->Integral(1, nx, inull, inull) / nx); - ratena = Form("%7.2f", ina <0 ? 0 : htp->Integral(1, nx, ina, ina) / nx); + rateped = iped <0 ? "NULL" : Form("%8.1f", htp->Integral(1, nx, iped, iped) / nx); + rateped2 = iped2<0 ? "NULL" : Form("%7.2f", htp->Integral(1, nx, iped2, iped2) / nx); + ratecal = ical <0 ? "NULL" : Form("%8.1f", htp->Integral(1, nx, ical, ical) / nx); + ratetrig = itrig<0 ? "NULL" : Form("%8.1f", htp->Integral(1, nx, itrig, itrig) / nx); + ratesum = isum <0 ? "NULL" : Form("%8.1f", htp->Integral(1, nx, isum, isum) / nx); + ratenull = inull<0 ? "NULL" : Form("%8.1f", htp->Integral(1, nx, inull, inull) / nx); + ratena = ina <0 ? "NULL" : Form("%7.2f", htp->Integral(1, nx, ina, ina) / nx); } // ***************************************************** - - // ***************************************************** - cout << "Sequence #" << seq << endl; @@ -319,6 +319,7 @@ cout << " Mean Signal inner [phe] " << meansiginner << endl; cout << " Mean Signal outer [phe] " << meansigouter << endl; + cout << " Mean extracted PulsePos " << meanextpulpos << " +- " << rmsextpulpos << endl; cout << " Mean calibrated PulsePos " << meanpulpos << " +- " << rmspulpos << endl; - cout << " Mean extracted PulsePos " << meanextpulpos << " +- " << rmsextpulpos << endl; + cout << " Mean calib pulse pos " << calpos << endl; // cout << " Mean ext.HiGain PulsePos " << meanpulhi << " +- " << rmspulhi << endl; // cout << " Mean ext.LoGain PulsePos " << meanpullo << " +- " << rmspullo << endl; @@ -346,4 +347,5 @@ " fPulsePosMean=%s, fPulsePosRms=%s, " " fPulsePosCheckMean=%s, fPulsePosCheckRms=%s, " + " fPulsePosCalib=%s, " //" fPulsePosHiMean=%s, fPulsePosHiRms=%s, " //" fPulsePosLoMean=%s, fPulsePosLoRms=%s, " @@ -360,4 +362,5 @@ meanpulpos.Data(), rmspulpos.Data(), meanextpulpos.Data(), rmsextpulpos.Data(), + calpos.Data(), //meanpulhi.Data(), rmspulhi.Data(), //meanpullo.Data(), rmspullo.Data(), Index: trunk/MagicSoft/Mars/datacenter/macros/fillstar.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillstar.C (revision 8938) +++ trunk/MagicSoft/Mars/datacenter/macros/fillstar.C (revision 8940) @@ -183,6 +183,6 @@ return 2; } - TString maxhum = Form("%5.1f", TMath::MaxElement(g->GetN(), g->GetY())); - TString avghum = Form("%5.1f", g->GetMean(2)); + TString maxhum = g->GetN()>0 ? Form("%5.1f", TMath::MaxElement(g->GetN(), g->GetY())) : "NULL"; + TString avghum = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("Temperature", "TGraph", "MHWeather"); @@ -192,5 +192,5 @@ return 2; } - TString avgtemp = Form("%5.1f", g->GetMean(2)); + TString avgtemp = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("WindSpeed", "TGraph", "MHWeather"); @@ -200,16 +200,16 @@ return 2; } - TString avgwind = Form("%5.1f", g->GetMean(2)); + TString avgwind = g->GetN()>0 ? Form("%5.1f", g->GetMean(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("Cloudiness", "TGraph", "MHWeather"); if (!g) cout << "WARNING - Reading of Cloudiness failed." << endl; - TString avgclouds = g ? Form("%5.1f", g->GetMean(2)) : 0; - TString rmsclouds = g ? Form("%5.1f", g->GetRMS(2)) : 0; + TString avgclouds = g ? Form("%5.1f", g->GetMean(2)) : "NULL"; + TString rmsclouds = g ? Form("%5.1f", g->GetRMS(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("TempSky", "TGraph", "MHWeather"); if (!g) cout << "WARNING - Reading of TempSky failed." << endl; - TString avgsky = g ? Form("%5.1f", g->GetMean(2)+200) : 0; + TString avgsky = g ? Form("%5.1f", g->GetMean(2)+200) : "NULL"; @@ -218,8 +218,6 @@ cout << "WARNING - Reading of NumStars failed." << endl; - Double_t numstarmed = g ? TMath::Median(g->GetN(), g->GetY()) : -1; - TString numstarsmed = Form("%5.1f", numstarmed); - Double_t numstarrms = g ? g->GetRMS(2) : -1; - TString numstarsrms = Form("%5.1f", numstarrms); + TString numstarsmed = g ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL"; + TString numstarsrms = g ? Form("%5.1f", g->GetRMS(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("NumStarsCor", "TGraph", "MHPointing"); @@ -230,6 +228,6 @@ } - TString numcorsmed = Form("%5.1f", g ? TMath::Median(g->GetN(), g->GetY()) : -1); - TString numcorsrms = Form("%5.1f", g ? g->GetRMS(2) : -1); + TString numcorsmed = g ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL"; + TString numcorsrms = g ? Form("%5.1f", g->GetRMS(2)) : "NULL"; g = (TGraph*)arr.FindObjectInCanvas("Brightness", "TGraph", "MHPointing"); @@ -240,7 +238,6 @@ } - TString skybrightnessmed = Form("%5.1f", g ? TMath::Median(g->GetN(), g->GetY()) : -1); - TString skybrightnessrms = Form("%5.1f", g ? g->GetRMS(2) : -1); - + TString skybrightnessmed = g ? Form("%5.1f", TMath::Median(g->GetN(), g->GetY())) : "NULL"; + TString skybrightnessrms = g ? Form("%5.1f", g->GetRMS(2)) : "NULL"; TString sequence = fname(TRegexp("star[0-9]+[.]root$"));