Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 9401) +++ trunk/MagicSoft/Mars/Changelog (revision 9402) @@ -18,5 +18,22 @@ -*-*- END OF LINE -*-*- - 2009/03/16 Daniel Hoehne-Moenchr + 2009/03/16 Thomas Bretz + + * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc: + - added new starguider calibration since 1000534 + + * datacenter/macros/plotdb.C, datacenter/macros/plotrundb.C: + - added option to set ds-number in datset + + * mgeom/MGeomCamMagic.cc: + - fixed layout of the MII camera + + * mpointing/MPointingDevCalc.cc: + - updated informations + + + + 2009/03/16 Daniel Hoehne-Moench + * datacenter/scripts/fillcamera - bugfix: the first line was moved by a tabulator @@ -25,4 +42,5 @@ 2009/03/16 Stefan Ruegamer + * datacenter/scripts/makecallistolinks - added >/dev/null in line 68 to prevent the mails to dc@astro Index: trunk/MagicSoft/Mars/NEWS =================================================================== --- trunk/MagicSoft/Mars/NEWS (revision 9401) +++ trunk/MagicSoft/Mars/NEWS (revision 9402) @@ -2,4 +2,8 @@ == == + + ;ganymed: + + * added new starguider calibration for sequences since 1000534 Index: trunk/MagicSoft/Mars/datacenter/macros/plotdb.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotdb.C (revision 9401) +++ trunk/MagicSoft/Mars/datacenter/macros/plotdb.C (revision 9402) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.55 2009-03-04 18:45:26 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.56 2009-03-16 15:13:43 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -379,5 +379,5 @@ delete fDataSet; } - void SetDataSet(const TString filename) + void SetDataSet(const TString filename, UInt_t num=(UInt_t)-1) { if (fDataSet) @@ -392,5 +392,5 @@ return; - fDataSet = new MDataSet(filename); + fDataSet = new MDataSet(filename, num); fPrimaryNumber="Sequences.fSequenceFirst"; } @@ -427,5 +427,5 @@ case kNone: case kGroupByPrimary: - query += Form("%s AS %s", valued.Data(), valued.Data()+1); + query += Form("%s AS %s", named.Data(), valued.Data()+1); break; case kGroupByHour: @@ -701,5 +701,5 @@ } -int plotdb(TString from, TString to, const char *dataset=0) +int plotdb(TString from, TString to, const char *dataset=0, UInt_t num=(UInt_t)-1) { MSQLMagic serv("sql.rc"); @@ -721,5 +721,5 @@ MPlot plot(serv); - plot.SetDataSet(dataset); + plot.SetDataSet(dataset, num); plot.SetDisplay(d); plot.SetRequestRange(from, to); @@ -731,5 +731,5 @@ } -int plotdb(const char *ds, TString path) +int plotdb(const char *ds, UInt_t num, TString path="/magic/sequences") { MSQLMagic serv("sql.rc"); @@ -751,5 +751,5 @@ MPlot plot(serv); - plot.SetDataSet(ds); + plot.SetDataSet(ds, num); plot.SetDisplay(d); plot.SetRequestRange("", ""); @@ -759,4 +759,9 @@ return 1; +} + +int plotdb(const char *ds, TString path="/magic/sequences") +{ + return plotdb(ds, (UInt_t)-1, path); } Index: trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C (revision 9401) +++ trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C (revision 9402) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.8 2009-03-06 20:36:20 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.9 2009-03-16 15:13:43 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -78,4 +78,7 @@ cond += tel; } + + //cond +=" AND (RunData.fSourceKEY=403 OR RunData.fSourceKEY=871) "; + plot.SetCondition(cond); @@ -94,9 +97,9 @@ plot.SetDescription("L1 trigger rate after cleaning;R_{L1}", "CleanL1"); - plot.Plot("RunDataCheck.fRateCleanedTrig", -0, 400, 1); + plot.Plot("RunDataCheck.fRateCleanedTrig", -0.5, 399.5, 1); plot.SetDescription("Sum trigger rate after cleaning;R_{sum}", "CleanSum"); - plot.Plot("RunDataCheck.fRateCleanedSum", -0, 400, 1); + plot.Plot("RunDataCheck.fRateCleanedSum", -0.5, 399.5, 1); plot.SetDescription("Unknown events trigger rate after cleaning;R_{0}", "Clean0"); - plot.Plot("RunDataCheck.fRateCleanedNull", -0, 400, 1); + plot.Plot("RunDataCheck.fRateCleanedNull", -0.5, 399.5, 1); /* @@ -122,5 +125,5 @@ } -int plotrundb(TString from, TString to, const char *dataset=0) +int plotrundb(TString from, TString to, const char *dataset=0, UInt_t num=(UInt_t)-1) { MSQLMagic serv("sql.rc"); @@ -142,5 +145,5 @@ MPlot plot(serv); - plot.SetDataSet(dataset); + plot.SetDataSet(dataset, num); plot.SetDisplay(d); plot.SetRequestRange(from, to); @@ -152,5 +155,5 @@ } -int plotrundb(const char *ds) +int plotrundb(const char *ds, UInt_t num=(UInt_t)-1) { MSQLMagic serv("sql.rc"); @@ -172,5 +175,5 @@ MPlot plot(serv); - plot.SetDataSet(ds); + plot.SetDataSet(ds, num); plot.SetDisplay(d); plot.SetRequestRange("", ""); Index: trunk/MagicSoft/Mars/ganymed.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed.rc (revision 9401) +++ trunk/MagicSoft/Mars/ganymed.rc (revision 9402) @@ -56,5 +56,5 @@ #MPointingDevCalc.MaxAge 1.0 -MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 +MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534 # ------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/ganymed_onoff.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed_onoff.rc (revision 9401) +++ trunk/MagicSoft/Mars/ganymed_onoff.rc (revision 9402) @@ -56,5 +56,5 @@ #MPointingDevCalc.MaxAge 1.0 -MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 +MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534 # ------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/ganymed_wobble.rc =================================================================== --- trunk/MagicSoft/Mars/ganymed_wobble.rc (revision 9401) +++ trunk/MagicSoft/Mars/ganymed_wobble.rc (revision 9402) @@ -56,5 +56,5 @@ #MPointingDevCalc.MaxAge 1.0 -MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 +MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534 # ------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc =================================================================== --- trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc (revision 9401) +++ trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc (revision 9402) @@ -889,5 +889,5 @@ // MGeomCamMagicII::MGeomCamMagicII(const char *name) - : MGeomCamDwarf(475., 30, 17, name) + : MGeomCamDwarf(505., 30, 17, name) { SetTitle("Geometry information of Magic II Camera"); @@ -902,5 +902,5 @@ // MGeomCamMagicII::MGeomCamMagicII(Double_t dist, const char *name) - : MGeomCamDwarf(475., 30, dist, name) + : MGeomCamDwarf(505., 30, dist, name) { SetTitle("Geometry information of Magic II Camera"); Index: trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 9401) +++ trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc (revision 9402) @@ -159,6 +159,7 @@ // 18. Oct. 2007 291104 // Correction for the offsets introduced by AMC // 14. Jan. 2008 328198 // Complete new pointing model -// 11. Jun. 2008 (ca. 23:00) // Before new TPoints +// 11. Jun. 2008 1000534 (ca. 23:00) // Before new TPoints // 19. Jun. 2008 (ca. 15:00) // From new TPoints +// 7. Mar. 2009 (ca. 14:00) // From new TPoints (0808-0902) // // From 2.2.2006 beginnig of the night (21:05h, run >=81855) to 24.2.2006