Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 7009) +++ trunk/MagicSoft/Mars/Changelog (revision 7010) @@ -21,4 +21,19 @@ -*-*- END OF LINE -*-*- + + 2005/05/10 Daniela Dorner + + * datacenter/macros/fillcalib.C: + - added some parameters (reading from calib*.root and inserting + into db) + + * datacenter/macros/setupdb.C: + - adapted macro to the new columns in the calibration db + + * datacenter/macros/fillsignal.C: + - fixed typo + + + 2005/05/10 Markus Meyer @@ -29,4 +44,5 @@ - commented out the ArcLength and Estimpact (will be not calculated for the moment) + Index: trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C (revision 7009) +++ trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C (revision 7010) @@ -61,4 +61,6 @@ #include +#include + #include #include @@ -67,4 +69,6 @@ #include "MSQLServer.h" +#include "MStatusArray.h" +#include "MHCamera.h" #include "MGeomCamMagic.h" #include "MBadPixelsCam.h" @@ -143,15 +147,88 @@ // hist.DrawCopy(); + //Getting values from the status display + MStatusArray arr; + if (arr.Read()<=0) + return 0; + + TH1 *h; + + //getting the mean and rms from the arrival time (inner cam) + h = (TH1*)arr.FindObjectInCanvas("HRelTimeHiGainArea0", "TH1F", "Time"); + if (!h) + { + cout << "WARNING - Could not find histogram HRelTimeHiGainArea0." << endl; + return 0; + } + + Float_t meani = h->GetMean(); + Float_t rmsi = h->GetRMS(); + meani = TMath::Nint(meani*10)/10.; + rmsi = TMath::Nint(rmsi*10)/10.; + TString meaninner = Form("%4.1f", meani); + TString rmsinner = Form("%4.1f", rmsi); + + cout << "bla: " << meaninner << ", " << rmsinner << endl; + cout << "bla: " << meaninner.Data() << ", " << rmsinner.Data() << endl; + + + //getting the mean and rms from the arrival time (outer cam) + h = (TH1*)arr.FindObjectInCanvas("HRelTimeHiGainArea1", "TH1F", "Time"); + if (!h) + { + cout << "WARNING - Could not find histogram HRelTimeHiGainArea1." << endl; + return 0; + } + + Float_t meano = h->GetMean(); + Float_t rmso = h->GetRMS(); + meano = TMath::Nint(meano*10)/10.; + rmso = TMath::Nint(rmso*10)/10.; + TString meanouter = Form("%4.1f", meano); + TString rmsouter = Form("%4.1f", rmso); + + + //Getting conversion factors + MHCamera *c = (MHCamera*)arr.FindObjectInCanvas("TotalConv", "MHCamera", "Conversion"); + if (!c) + { + cout << "WARNING - Could not find MHCamera TotalConv." << endl; + return 0; + } + + TArrayI inner(1), outer(1); + inner[0] = 0; + outer[0] = 1; + + Int_t s0[] = { 1, 2, 3, 4, 5, 6 }; + + Stat_t meanconvi = c->GetMeanSectors(TArrayI(6, s0), inner); + Stat_t meanconvo = c->GetMeanSectors(TArrayI(6, s0), outer); + meanconvi = TMath::Nint(meanconvi*10)/10.; + meanconvo = TMath::Nint(meanconvo*10)/10.; + TString meanconvinner=Form("%4.1f", meanconvi); + TString meanconvouter=Form("%4.1f", meanconvo); + + + //Getting sequ# from filename TString sequence = fname(TRegexp("calib[0-9]+[.]root$")); if (sequence.IsNull()) - return 0; + { + cout << "WARNING - Could get sequence# from filename: " << fname << endl; + return 0; + } Int_t seq = atoi(sequence.Data()+5); + cout << "Sequence #" << seq << endl; - cout << " Unsuitable: (i/o) " << Form("%3d %3d", (int)unsin, (int)unsout) << endl; // Unbrauchbar - cout << " Unreliable: (i/o) " << Form("%3d %3d", (int)unrin, (int)unrout) << endl; // Unzuverlaessig - cout << " Isolated: (i/o) " << Form("%3d %3d", (int)isoin, (int)isoout) << endl; // Isolated (unbrauchbar) - cout << " Max.Cluster: (i/o) " << Form("%3d", (int)clumax) << endl; // Max Cluster + cout << " Unsuitable: (i/o) " << Form("%3d %3d", (int)unsin, (int)unsout) << endl; // Unbrauchbar + cout << " Unreliable: (i/o) " << Form("%3d %3d", (int)unrin, (int)unrout) << endl; // Unzuverlaessig + cout << " Isolated: (i/o) " << Form("%3d %3d", (int)isoin, (int)isoout) << endl; // Isolated (unbrauchbar) + cout << " Max.Cluster: " << Form("%3d", (int)clumax) << endl; // Max Cluster + cout << " Arr Time inner: " << Form("%4.1f +- %4.1f", meani, rmsi) << endl; + cout << " Arr Time outer: " << Form("%4.1f +- %4.1f", meano, rmso) << endl; + cout << " Mean Conv inner: " << Form("%4.1f", meanconvi) << endl; + cout << " Mean Conv outer: " << Form("%4.1f", meanconvo) << endl; TString query; @@ -167,7 +244,17 @@ " fIsolatedInner=%d, " " fIsolatedOuter=%d, " - " fIsolatedMaxCluster=%d", + " fIsolatedMaxCluster=%d, ", + " fArrTimeMeanInner=%s, " + " fArrTimeRmsInner=%s, " + " fArrTimeMeanOuter=%s, " + " fArrTimeRmsOuter=%s, " + " fConvFactorInner=%s, " + " fConvFactorOuter=%s ", seq, (int)unsin, (int)unsout, (int)unrin, - (int)unrout, (int)isoin, (int)isoout, (int)clumax); + (int)unrout, (int)isoin, (int)isoout, + (int)clumax, + meaninner.Data(), rmsinner.Data(), + meanouter.Data(), rmsouter.Data(), + meanconvinner.Data(), meanconvouter.Data()); } else @@ -180,9 +267,21 @@ " fIsolatedInner=%d, " " fIsolatedOuter=%d, " - " fIsolatedMaxCluster=%d" - " WHERE fSequenceFirst=%d,", + " fIsolatedMaxCluster=%d, " + " fArrTimeMeanInner=%s, " + " fArrTimeRmsInner=%s, " + " fArrTimeMeanOuter=%s, " + " fArrTimeRmsOuter=%s, " + " fConvFactorInner=%s, " + " fConvFactorOuter=%s " + " WHERE fSequenceFirst=%d ", (int)unsin, (int)unsout, (int)unrin,(int)unrout, - (int)isoin, (int)isoout, (int)clumax, seq); - } + (int)isoin, (int)isoout, (int)clumax, + meaninner.Data(), rmsinner.Data(), + meanouter.Data(), rmsouter.Data(), + meanconvinner.Data(), meanconvouter.Data(), + seq); + } + + cout << "q: " << query << endl; if (dummy) Index: trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C (revision 7009) +++ trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C (revision 7010) @@ -119,6 +119,6 @@ cout << "Sequence #" << seq << endl; - cout << " Mean Ped RMS inner [phe] " << Form("%4.1f", meani) << endl; // Unbrauchbar - cout << " Mean Ped RMS outer [phe] " << Form("%4.1f", meano) << endl; // Unbrauchbar + cout << " Mean Ped RMS inner [phe] " << Form("%4.1f", meani) << endl; + cout << " Mean Ped RMS outer [phe] " << Form("%4.1f", meano) << endl; TString query = Form("UPDATE MyMagic.Calibration SET fMeanPedRmsInner=%s, " Index: trunk/MagicSoft/Mars/datacenter/macros/setupdb.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/setupdb.C (revision 7009) +++ trunk/MagicSoft/Mars/datacenter/macros/setupdb.C (revision 7010) @@ -516,4 +516,10 @@ " fMeanPedRmsInner FLOAT(5,1) NOT NULL," " fMeanPedRmsOuter FLOAT(5,1) NOT NULL," + " fArrTimeMeanInner FLOAT(5,1) NOT NULL," + " fArrTimeRmsInner FLOAT(5,1) NOT NULL," + " fArrTimeMeanOuter FLOAT(5,1) NOT NULL," + " fArrTimeRmsOuter FLOAT(5,1) NOT NULL," + " fConvFactorInner FLOAT(5,1) NOT NULL," + " fConvFactorOuter FLOAT(5,1) NOT NULL," " fLastUpdate TIMESTAMP" ")"));