Index: trunk/MagicSoft/Mars/datacenter/macros/fillcamera.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillcamera.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/fillcamera.C (revision 8996) @@ -47,5 +47,4 @@ #include -#include #include #include @@ -656,6 +655,6 @@ // "where MCRunData.fRunNumber=%d;", RunNum)); TString query3(Form("SELECT fMCParticleName, fSpectrum FROM MCRunData " - "LEFT JOIN MCParticle ON MCRunData.fMCParticleKEY=MCParticle.fMCParticleKEY " - "LEFT JOIN Spectrum ON Spectrum.fSpectrumKEY=MCRunData.fSpectrumKEY " + "LEFT JOIN MCParticle USING (fMCParticleKEY) " + "LEFT JOIN Spectrum USING (fSpectrumKEY) " "WHERE MCRunData.fRunNumber=%d;", RunNum)); res = serv.Query(query3); @@ -773,7 +772,5 @@ int fillcamera(TString fname, Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -797,7 +794,5 @@ int fillcamera(TString path="/magic/montecarlo/camera", Bool_t dummy=kTRUE) { - TEnv env("mcsql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("mcsql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C (revision 8996) @@ -64,5 +64,4 @@ #include -#include #include @@ -206,7 +205,5 @@ int filldotrbk(TString path="/data/MAGIC/Period017/ccdata", Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C (revision 8996) @@ -79,5 +79,4 @@ #include -#include #include #include @@ -148,4 +147,11 @@ { cout << "First character is not an M." << endl; + cout << strng << endl; + strng.ReadLine(fin); + continue; + } + if (strng[1]!='1') + { + cout << "Only MAGIC 1 implemented so far." << endl; cout << strng << endl; strng.ReadLine(fin); @@ -580,7 +586,5 @@ int filldotrun(const TString path="/data/MAGIC/Period018/ccdata", Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/fillganymed.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillganymed.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/fillganymed.C (revision 8996) @@ -55,5 +55,4 @@ #include -#include #include @@ -218,7 +217,5 @@ int fillganymed(TString fname, Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/filloptical.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/filloptical.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/filloptical.C (revision 8996) @@ -46,5 +46,4 @@ #include -#include #include @@ -274,7 +273,5 @@ int filloptical(TString path, Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/fillsources.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillsources.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/fillsources.C (revision 8996) @@ -36,9 +36,8 @@ #include -#include - -#include #include #include + +#include "MSQLServer.h" using namespace std; @@ -67,7 +66,5 @@ int fillsources(TString catalog) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/fillstar.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/fillstar.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/fillstar.C (revision 8996) @@ -59,5 +59,4 @@ #include -#include #include @@ -310,7 +309,5 @@ int fillstar(TString fname, Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C (revision 8996) @@ -57,10 +57,10 @@ #include -#include #include -#include "MSQLMagic.h" #include #include + +#include "MSQLMagic.h" using namespace std; @@ -69,7 +69,5 @@ int findcacofiles() { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -87,6 +85,6 @@ query+=" DATE_FORMAT(ADDDATE(if(fRunStart='0000-00-00 00:00:00', fRunStop, fRunStart), INTERVAL +13 HOUR), '%Y/%m/%d') "; query+=" FROM RunProcessStatus "; - query+=" LEFT JOIN RunData ON RunData.fRunNumber=RunProcessStatus.fRunNumber "; - query+=" LEFT JOIN Source ON RunData.fSourceKEY=Source.fSourceKEY "; + query+=" LEFT JOIN RunData USING (fRunNumber) "; + query+=" LEFT JOIN Source USING (fSourceKEY) "; query+=" WHERE IsNull(fCaCoFileFound) AND fExcludedFDAKEY=1 "; query+=" AND RunProcessStatus.fRunNumber > 10000 AND NOT IsNull(fCCFileAvail)"; @@ -115,5 +113,5 @@ query ="SELECT MAX(fCaCoFileFound) FROM RunProcessStatus "; - query+=" LEFT JOIN RunData ON RunData.fRunNumber=RunProcessStatus.fRunNumber "; + query+=" LEFT JOIN RunData USING (fRunNumber) "; query+=Form("WHERE DATE_FORMAT(ADDDATE(fRunStart, INTERVAL +13 HOUR), '%%Y/%%m/%%d')='%s' ", (*row)[1]); Index: trunk/MagicSoft/Mars/datacenter/macros/getdolist.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/getdolist.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/getdolist.C (revision 8996) @@ -68,8 +68,9 @@ #include -#include #include #include +#include "MSQLServer.h" + using namespace std; @@ -77,7 +78,5 @@ int getdolist(TString table, TString column, TString date, TString listpath) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C (revision 8996) @@ -57,10 +57,10 @@ #include -#include #include -#include #include #include + +#include "MSQLServer.h" using namespace std; @@ -68,7 +68,5 @@ int insertcacofile(TString runnumber, TString newrunnumber) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C (revision 8996) @@ -54,6 +54,4 @@ #include -#include - #include "MSQLMagic.h" @@ -62,7 +60,5 @@ int insertdataset(TString number, TString source, TString wobble, TString comment, Bool_t dummy=kTRUE) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C (revision 8996) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.8 2007-10-07 21:11:01 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.9 2008-07-05 19:01:42 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -78,463 +78,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "MTime.h" -#include "MAstro.h" -#include "MDataSet.h" -#include "MSQLMagic.h" -#include "MStatusDisplay.h" - -class MPlot : public MParContainer -{ -public: - // Possible constants to group-by (average) over a certain period - enum GroupBy_t - { - kNone, - kGroupByPrimary, - kGroupByHour, - kGroupByNight, - kGroupByWeek, - kGroupByMonth, - kGroupBySeason, - kGroupByYear - }; - -private: - MSQLMagic &fServer; // Reference to the sql-server class - - MDataSet *fDataSet; // A possible dtaset to highlite single points - - TString fPrimaryDate; // The name of the data we plot - TString fPrimaryNumber; // The corresponding name for the key number - TString fSecondary; // The value versus which the second plot is made - - TString fRequestFrom; // Start of a requested date range - TString fRequestTo; // End of a requested date range - Int_t fRequestPeriod; // A possible requested period - - Float_t fPlotMin; - Float_t fPlotMax; - - Float_t fHistMin; - Float_t fHistMax; - - TString fDescription; // The description (title) of the plot - TString fNameTab; // The name of the tab in the display - - TString fCondition; // An additional condition added to the query - GroupBy_t fGroupBy; // A possible Group-By flag - - // -------------------------------------------------------------------------- - // - // Function to plot the result of the query - // - void PlotTable(TSQLResult &res, TString name, Float_t fmin, Float_t fmax, Float_t resolution) - { - // Enable all otions in the statistics box - gStyle->SetOptStat(111111); - - // Create TGraph objects - TGraph > = res.GetFieldCount()>4 ? *new TGraphErrors : *new TGraph; - gt.SetNameTitle(name, Form("%s vs Time", name.Data())); - gt.SetMarkerStyle(kFullDotMedium); - - TGraph gz; - gz.SetNameTitle(name, Form("%s vs ", name.Data())); - gz.SetMarkerStyle(kFullDotMedium); - - TGraph gt0, gt1; - gt0.SetMarkerColor(kRed); - gt1.SetMarkerColor(kBlue); - gt0.SetMarkerStyle(kFullDotLarge); - gt1.SetMarkerStyle(kFullDotLarge); - - TGraph gz0, gz1; - gz0.SetMarkerColor(kRed); - gz1.SetMarkerColor(kBlue); - gz0.SetMarkerStyle(kFullDotLarge); - gz1.SetMarkerStyle(kFullDotLarge); - - Int_t first = -1; - Int_t last = -1; - - // Loop over the data - TSQLRow *row=0; - while ((row=res.Next())) - { - // Get all fields of this row - const char *date = (*row)[0]; - const char *zd = (*row)[1]; - const char *val = (*row)[2]; - const char *snum = res.GetFieldCount()>3 ? (*row)[3] : 0; - const char *verr = res.GetFieldCount()>4 ? (*row)[5] : 0; - - delete row; - - if (!date || !val || !zd) - continue; - - // check if date is valid - MTime t(date); - if (!t.SetSqlDateTime(date)) - continue; - - // check if it belongs to the requested MAGIC period - if (fRequestPeriod>0 && MAstro::GetMagicPeriod(t.GetMjd())!=fRequestPeriod) - continue; - - // Get axis range - if (first<0) - first = TMath::Nint(TMath::Floor(t.GetMjd())); - last = TMath::Nint(TMath::Ceil(t.GetMjd())); - - // Convert a possible key number into a integer - UInt_t seq = snum ? atoi(snum) : 0; - - // convert primary and secondary value into floats - Float_t value = atof(val); - Float_t zenith = atof(zd); - - // If a datset is given add the point to the special TGraphs - // used for highliting these dates - if (fDataSet) - { - if (fDataSet->HasOnSequence(seq)) - { - gt1.SetPoint(gt1.GetN(), t.GetAxisTime(), value); - gz1.SetPoint(gz1.GetN(), zenith, value); - } - - if (fDataSet->HasOffSequence(seq)) - { - gt0.SetPoint(gt0.GetN(), t.GetAxisTime(), value); - gz0.SetPoint(gz0.GetN(), zenith, value); - } - } - - // Add Data to TGraph - gt.SetPoint(gt.GetN(), t.GetAxisTime(), value); - gz.SetPoint(gz.GetN(), zenith, value); - - // Set error-bar, if one - if (verr) - static_cast(gt).SetPointError(gt.GetN()-1, 0, atof(verr)); - } - - // If this is done earlier the plots remain empty since root 5.12/00 - if (fmax>fmin) - { - gt.SetMinimum(fmin); - gt.SetMaximum(fmax); - gz.SetMinimum(fmin); - gz.SetMaximum(fmax); - } - - gROOT->SetSelectedPad(0); - - // Create a TCanvas or open a new tab - TString title = fNameTab.IsNull() ? name(name.First('.')+2, name.Length()) : fNameTab; - TCanvas &c = fDisplay ? fDisplay->AddTab(title) : *new TCanvas; - // Set fillcolor, remove border and divide pad - c.SetFillColor(kWhite); - c.SetBorderMode(0); - c.Divide(1,2); - - // Output mean and rms to console - cerr << setprecision(4) << setw(10) << title << ": "; - if (gt.GetN()==0) - { - cerr << " " << endl; - return; - } - cerr << setw(8) << gt.GetMean(2) << "+-" << setw(8) << gt.GetRMS(2) << " "; - if (gt0.GetN()>0 || gt1.GetN()>0) - { - cerr << setw(8) << gt1.GetMean(2) << "+-" << setw(8) << gt1.GetRMS(2) << " "; - cerr << setw(8) << gt0.GetMean(2) << "+-" << setw(8) << gt0.GetRMS(2); - } - cerr << endl; - - TVirtualPad *pad = gPad; - - // draw contants of pad 2 (counting starts at 0) - pad->cd(2); - gPad->SetBorderMode(0); - gPad->SetFrameBorderMode(0); - gPad->SetGridy(); - - gPad->SetLeftMargin(0.06); - gPad->SetRightMargin(0.06); - gPad->SetBottomMargin(0.08); - - // format axis - TH1 *h = gt.GetHistogram(); - - h->SetXTitle("Time"); - h->SetYTitle(name); - h->GetXaxis()->SetTimeDisplay(1); - h->GetYaxis()->SetTitleOffset(0.8); - h->GetXaxis()->SetTitleOffset(1.0); - h->GetXaxis()->SetLabelOffset(0.01); - - // draw TGraph - gt.DrawClone("AP"); - if (gt0.GetN()>0) - gt0.DrawClone("P"); - if (gt1.GetN()>0) - gt1.DrawClone("P"); - - // Add lines and text showing the MAGIC periods - TLine l; - TText t; - Int_t num=0; - l.SetLineStyle(kDotted); - l.SetLineColor(kBlue); - t.SetTextColor(kBlue); - l.SetLineWidth(1); - t.SetTextSize(h->GetXaxis()->GetLabelSize()); - t.SetTextAlign(21); - Int_t p0 = MAstro::GetMagicPeriod(first); - for (Int_t p = first; pGetMinimum(), MTime(p).GetAxisTime(), h->GetMaximum()); - t.DrawText(MTime(p+15).GetAxisTime(), h->GetMaximum(), Form("%d", p1)); - num++; - } - p0 = p1; - } - if (num<4) - gPad->SetGridx(); - - const Double_t min = fHistMin>fHistMax ? h->GetMinimum()-resolution/2 : fHistMin; - const Double_t max = fHistMin>fHistMax ? h->GetMaximum()+resolution/2 : fHistMax; - - // Use this to save the pad with the time development to a file - //gPad->SaveAs(Form("plotdb-%s.eps", title.Data())); - - // Go back to first (upper) pad, format it and divide it again - pad->cd(1); - gPad->SetBorderMode(0); - gPad->SetFrameBorderMode(0); - gPad->Divide(2,1); - - TVirtualPad *pad2 = gPad; - - // format left pad - pad2->cd(1); - gPad->SetBorderMode(0); - gPad->SetFrameBorderMode(0); - gPad->SetGridx(); - gPad->SetGridy(); - - // Create histogram - const Int_t n = resolution>0 ? TMath::Nint((max-min)/resolution) : 50; - - TH1F hist("Hist", Form("Distribution of %s", fDescription.IsNull() ? name.Data() : fDescription.Data()), n, min, max); - hist.SetDirectory(0); - - // Fill data into histogra, - for (int i=0; icd(2); - gPad->SetBorderMode(0); - gPad->SetFrameBorderMode(0); - gPad->SetGridy(); - - // format graph - TH1 *h2 = gz.GetHistogram(); - - h2->SetXTitle("Zd"); - h2->SetYTitle(name); - - // draw graph - gz.DrawClone("AP"); - - if (gz0.GetN()>0) - gz0.DrawClone("P"); - if (gz1.GetN()>0) - gz1.DrawClone("P"); - } - -public: - MPlot(MSQLMagic &server) : fServer(server), fDataSet(NULL), - fRequestPeriod(-1), fPlotMin(0), fPlotMax(-1), fHistMin(0), fHistMax(-1), fGroupBy(kNone) - { - } - ~MPlot() - { - if (fDataSet) - delete fDataSet; - } - void SetDataSet(const TString filename) - { - if (fDataSet) - { - delete fDataSet; - fDataSet = NULL; - } - if (!filename.IsNull()) - fDataSet = new MDataSet(filename); - } - void SetPlotRange(Float_t min, Float_t max, Int_t n=5) { fPlotMin = min; fPlotMax = max; } - void SetHistRange(Float_t min, Float_t max) { fHistMin = min; fHistMax = max; } - void SetRequestRange(const char *from="", const char *to="") { fRequestFrom = from; fRequestTo = to; } - void SetRequestPeriod(Int_t n=-1) { fRequestPeriod = n; } - void SetCondition(const char *cond="") { fCondition = cond; } - void SetDescription(const char *d, const char *t=0) { fDescription = d; fNameTab = t; } - void SetGroupBy(GroupBy_t b=kGroupByWeek) { fGroupBy=b; } - void SetPrimaryDate(const char *ts) { fPrimaryDate=ts; } - void SetPrimaryNumber(const char *ts) { fPrimaryNumber=ts; } - void SetSecondary(const char *ts) { fSecondary=ts; } - - Int_t QueryKeyOfSource(TString src) - { - return fServer.QueryKeyOfName("Object", src, kFALSE); - } - - Bool_t Plot(const char *value, Float_t min=0, Float_t max=-1, Float_t resolution=0) - { - TString named = fPrimaryDate; - TString named2 = fSecondary; - TString namev = value; - - TString tablev = namev(0, namev.First('.')); - TString valuev = namev(namev.First('.')+1, namev.Length()); - - TString tabled = named(0, named.First('.')); - TString valued = named(named.First('.')+1, named.Length()); - - TString query="SELECT "; - switch (fGroupBy) - { - case kNone: - case kGroupByPrimary: - query += Form("%s AS %s", valued.Data(), valued.Data()+1); - break; - case kGroupByHour: - query += Form("DATE_FORMAT(%s, '%%Y-%%m-%%d %%H:30:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - case kGroupByNight: - query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-%%d 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - case kGroupByWeek: - query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%x%%v') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - case kGroupByMonth: - query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - case kGroupBySeason: - //query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-%%m-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - case kGroupByYear: - query += Form("DATE_FORMAT(ADDDATE(%s,Interval 12 hour), '%%Y-08-15 00:00:00') AS %s ", fPrimaryDate.Data(), valued.Data()+1); - break; - } - - if (fGroupBy==kNone) - { - query += ", "; - query += fSecondary; - query += ", "; - query += value; - query += ", "; - query += fPrimaryNumber; - query += " "; - } - else - { - query += ", AVG("; - query += fSecondary; - query += "), AVG("; - query += value; - query += "), "; - query += fPrimaryNumber; - query += ", STD("; - query += fSecondary; - query += "), STD("; - query += value; - query += ") "; - } - - query += Form("FROM %s ", tabled.Data()); - - TString where(fCondition); - - const Bool_t interval = !fRequestFrom.IsNull() && !fRequestTo.IsNull(); - if (interval) - { - if (!where.IsNull()) - where += " AND "; - where += Form("%s BETWEEN '%s' AND '%s' ", - fPrimaryDate.Data(), fRequestFrom.Data(), fRequestTo.Data()); - } - - if (!where.IsNull()) - where += " AND "; - where += fCondition; - where += " "; - - // ------------------------------ - - query += fServer.GetJoins(tabled, query+" "+where); - - if (!where.IsNull()) - { - query += "WHERE "; - query += where; - } - - if (fGroupBy!=kNone) - { - query += Form("GROUP BY %s ", valued.Data()+1); - //query += Form(" HAVING COUNT(%s)=(COUNT(*)+1)/2 ", valuev.Data()); - } - query += Form("ORDER BY %s ", valued.Data()+1); - - // ------------------------------ - - TSQLResult *res = fServer.Query(query); - if (!res) - return kFALSE; - - if (max>min) - PlotTable(*res, namev, min, max, resolution); - else - PlotTable(*res, namev, fPlotMin, fPlotMax, resolution); - - delete res; - return kTRUE; - } -}; - -void plotall(MPlot &plot, TString source) +#include "plotdb.C" + +void plotalloptical(MPlot &plot, TString source) { // Setup here the values for timestamp and secondary (upper/right) plot @@ -548,9 +92,8 @@ if (!source.IsNull()) { - const Int_t key = plot.QueryKeyOfSource(source); + const Int_t key = plot.GetServer().QueryKeyOfName("Object", source, kFALSE); if (key<0) return; cond += Form(" AND Object.fObjectKEY=%d", key); - } @@ -625,7 +168,5 @@ int plotoptical(TString from, TString to, const char *source=0) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -648,5 +189,5 @@ plot.SetDisplay(d); plot.SetRequestRange(from, to); - plotall(plot, source); + plotalloptical(plot, source); // Use this to create output plots automatically // d->SaveAsRoot("plotoptical.root"); @@ -658,7 +199,5 @@ int plotoptical(const char *source) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -681,5 +220,5 @@ plot.SetDisplay(d); plot.SetRequestRange("", ""); - plotall(plot, source); + plotalloptical(plot, source); // Use this to create output plots automatically // d->SaveAsRoot("plotoptical.root"); @@ -691,7 +230,5 @@ int plotoptical(Int_t period, const char *source="") { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -714,5 +251,5 @@ plot.SetDisplay(d); plot.SetRequestPeriod(period); - plotall(plot, source); + plotalloptical(plot, source); // Use this to create output plots automatically Index: trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C (revision 8996) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.5 2008-07-03 16:29:48 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.6 2008-07-05 19:01:42 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -111,7 +111,5 @@ int plotrundb(TString from, TString to, const char *dataset=0) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -143,7 +141,5 @@ int plotrundb(const char *ds) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { @@ -175,7 +171,5 @@ int plotrundb(Int_t period, const char *dataset="") { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/plotstat.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotstat.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/plotstat.C (revision 8996) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: plotstat.C,v 1.6 2008-06-19 15:18:57 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: plotstat.C,v 1.7 2008-07-05 19:01:42 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -48,5 +48,4 @@ #include -#include #include #include @@ -663,7 +662,5 @@ int plotstat(Int_t first=-1, Int_t last=-1) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C (revision 8996) @@ -49,9 +49,8 @@ #include -#include - -#include #include #include + +#include "MSQLServer.h" using namespace std; @@ -60,7 +59,5 @@ int resetallruns(TString filename, TString column) { - TEnv env("sql.rc"); - - MSQLServer serv(env); + MSQLServer serv("sql.rc"); if (!serv.IsConnected()) { Index: trunk/MagicSoft/Mars/datacenter/macros/setstatus.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/setstatus.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/setstatus.C (revision 8996) @@ -18,5 +18,5 @@ ! Author(s): Daniela Dorner, 01/2005 ! -! Copyright: MAGIC Software Development, 2000-2006 +! Copyright: MAGIC Software Development, 2000-2008 ! ! @@ -50,5 +50,4 @@ // ///////////////////////////////////////////////////////////////////////////// - #include #include @@ -56,10 +55,9 @@ #include - -#include - -#include #include #include + +#include "MTime.h" +#include "MSQLServer.h" using namespace std; Index: trunk/MagicSoft/Mars/datacenter/macros/writedatasetfile.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/writedatasetfile.C (revision 8994) +++ trunk/MagicSoft/Mars/datacenter/macros/writedatasetfile.C (revision 8996) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: writedatasetfile.C,v 1.2 2007-01-12 17:33:10 snruegam Exp $ +! $Name: not supported by cvs2svn $:$Id: writedatasetfile.C,v 1.3 2008-07-05 19:01:43 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -20,5 +20,5 @@ ! Author(s): Thomas Bretz, 11/2006 ! -! Copyright: MAGIC Software Development, 2000-2006 +! Copyright: MAGIC Software Development, 2000-2008 ! ! @@ -50,5 +50,4 @@ #include -#include #include @@ -91,6 +90,5 @@ //get sequence information from database TString query0(Form("SELECT fSourceName, fComment, fDataSetName, fRunTime, fObservationModeKEY" - " FROM DataSets LEFT JOIN Source ON" - " Source.fSourceKEY=DataSets.fSourceKEY" + " FROM DataSets LEFT JOIN Source USING (fSourceKEY)" " WHERE fDataSetNumber=%d", dsno)); @@ -167,7 +165,5 @@ int writedatasetfile(Int_t dsno, TString seqpath) { - TEnv env("sql.rc"); - - MSQLMagic serv(env); + MSQLMagic serv("sql.rc"); if (!serv.IsConnected()) {