Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7111)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7112)
@@ -68,4 +68,16 @@
    * datacenter/scripts/runganymed: 
      - changed # of processes
+
+   * datacenter/macros/buildsequenceentries.C, filldotrbk.C, fillstar.C,
+       insertcacofile.C, plotdb.C, setstatus.C, checkfileavail.C,
+       doexclusions.C, filldotrun.C, findcacofiles.C, insertdataset.C, 
+       resetallruns.C, setupdb.C, checkstardone., fillcalib.C, 
+       fillsignal.C, getdolist.C, insertdate.C, resetcolumn.C, 
+       writesequencefile.C: 
+     - adapted the macros to the changes in msql/MSQLServer.cc
+
+   * datacenter/macros/fillstar.C:
+     - adapted the functions for the myon parameter after the bugfixes 
+       in the calibration
 
 
Index: trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C	(revision 7112)
@@ -64,5 +64,5 @@
 Bool_t DeleteSequences(MSQLServer &serv, TString cond)
 {
-    TString query(Form("SELECT fSequenceFirst FROM MyMagic.Sequences"
+    TString query(Form("SELECT fSequenceFirst FROM Sequences"
                        " WHERE %s AND fManuallyChangedKEY=1", cond.Data()));
 
@@ -74,5 +74,5 @@
     while ((row=res->Next()))
     {
-        query = Form("DELETE FROM MyMagic.Calibration WHERE fSequenceFirst=%s", (*row)[0]);
+        query = Form("DELETE FROM Calibration WHERE fSequenceFirst=%s", (*row)[0]);
 
         TSQLResult *res = serv.Query(query);
@@ -81,5 +81,5 @@
         delete res;
 
-        query = Form("DELETE FROM MyMagic.Star WHERE fSequenceFirst=%s", (*row)[0]);
+        query = Form("DELETE FROM Star WHERE fSequenceFirst=%s", (*row)[0]);
 
         TSQLResult *res = serv.Query(query);
@@ -88,5 +88,5 @@
         delete res;
 
-        query = Form("DELETE FROM MyMagic.SequenceProcessStatus WHERE fSequenceFirst=%s", (*row)[0]);
+        query = Form("DELETE FROM SequenceProcessStatus WHERE fSequenceFirst=%s", (*row)[0]);
 
         res = serv.Query(query);
@@ -99,5 +99,5 @@
         gSystem->Unlink(fname);
 
-        query = Form("UPDATE MyMagic.RunData SET fSequenceFirst=0 WHERE fSequenceFirst=%s", (*row)[0]);
+        query = Form("UPDATE RunData SET fSequenceFirst=0 WHERE fSequenceFirst=%s", (*row)[0]);
 
         res = serv.Query(query);
@@ -109,5 +109,5 @@
     delete res;
 
-    query = Form("DELETE FROM MyMagic.Sequences WHERE %s AND fManuallyChangedKEY=1", cond.Data());
+    query = Form("DELETE FROM Sequences WHERE %s AND fManuallyChangedKEY=1", cond.Data());
     res = serv.Query(query);
     if (!res)
@@ -121,5 +121,5 @@
 Int_t CheckOverlap(MSQLServer &serv, Int_t from, Int_t to)
 {
-    TString query(Form("SELECT fSequenceFirst FROM MyMagic.Sequences WHERE"
+    TString query(Form("SELECT fSequenceFirst FROM Sequences WHERE"
                        " (%d BETWEEN fSequenceFirst AND fSequenceLast) OR "
                        " (%d BETWEEN fSequenceFirst AND fSequenceLast)", from, to));
@@ -173,5 +173,5 @@
                   " fProjectKEY, fHvSettingsKEY, fDiscriminatorThresholdTableKEY,"
                   " fTriggerDelayTableKEY, fLightConditionsKEY, fTestFlagKEY"
-                  " FROM MyMagic.RunData");
+                  " FROM RunData");
     query += Form(" WHERE fRunTypeKEY=%d AND fSourceKEY=%d AND fExcludedFDAKEY=1 AND (fRunNumber BETWEEN %d AND %d)"
                   " ORDER BY fRunNumber", type, src, from, to);
@@ -214,5 +214,5 @@
     query +=      " MIN(fZenithDistance), MAX(fZenithDistance), ";
     query +=      " MIN(fAzimuth), MAX(fAzimuth) ";
-    query += Form(" FROM MyMagic.RunData"
+    query += Form(" FROM RunData"
                   " WHERE fRunTypeKEY=2 AND fSourceKEY=%d AND (fRunNumber BETWEEN %d AND %d) AND fExcludedFDAKEY=1",
                   src, from, to);
@@ -239,5 +239,5 @@
 
     // ========== Request start time of sequence ==========
-    query = Form("SELECT fRunStart FROM MyMagic.RunData WHERE fRunNumber=%d AND fSourceKEY=%d AND fExcludedFDAKEY=1", from, src);
+    query = Form("SELECT fRunStart FROM RunData WHERE fRunNumber=%d AND fSourceKEY=%d AND fExcludedFDAKEY=1", from, src);
 
     res = serv.Query(query);
@@ -260,5 +260,5 @@
                  " fHvSettingsKEY, fDiscriminatorThresholdTableKEY,"
                  " fTriggerDelayTableKEY, fLightConditionsKEY, fTestFlagKEY"
-                 " FROM MyMagic.RunData"
+                 " FROM RunData"
                  " WHERE fRunTypeKEY=2 AND fSourceKEY=%d AND fExcludedFDAKEY=1 AND (fRunNumber BETWEEN %d AND %d)"
                  " LIMIT 1", src, from, to);
@@ -275,5 +275,5 @@
     }
 
-    TString query1 = Form("INSERT MyMagic.Sequences SET"
+    TString query1 = Form("INSERT Sequences SET"
                           " fSequenceFirst=%d,"
                           " fSequenceLast=%d,"
@@ -302,5 +302,5 @@
                           (*row)[7]);
 
-    TString query2 = Form("UPDATE MyMagic.RunData SET fSequenceFirst=%d WHERE"
+    TString query2 = Form("UPDATE RunData SET fSequenceFirst=%d WHERE"
                           "  (fRunNumber  BETWEEN %d AND %d) AND"
                           "  (fRunTypeKEY BETWEEN  2 AND  4) AND"
@@ -308,5 +308,5 @@
                           from, from, to, src, (*row)[3]);
 
-    TString query3 = Form("INSERT MyMagic.SequenceProcessStatus SET fSequenceFirst=%d ",
+    TString query3 = Form("INSERT SequenceProcessStatus SET fSequenceFirst=%d ",
                           from);
     delete res;
@@ -364,5 +364,5 @@
 {
     TString query(Form("SELECT fSourceKEY"
-                       " FROM MyMagic.RunData"
+                       " FROM RunData"
                        " WHERE %s AND fExcludedFDAKEY=1 AND (fRunTypeKEY BETWEEN 2 AND 4) GROUP BY fSourceKEY",
                        cond.Data())
@@ -392,5 +392,5 @@
 
     TString query(Form("SELECT fRunNumber, fRunTypeKEY, fRunStart, fRunStop"
-                       " FROM MyMagic.RunData"
+                       " FROM RunData"
                        " WHERE %s AND fSourceKEY=%d AND fExcludedFDAKEY=1 AND"
                        " (fRunTypeKEY BETWEEN 2 AND 4)"
Index: trunk/MagicSoft/Mars/datacenter/macros/checkfileavail.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/checkfileavail.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/checkfileavail.C	(revision 7112)
@@ -45,5 +45,5 @@
 TString GetStatus(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column)
 {
-    TString query(Form("SELECT %s FROM MyMagic.%s WHERE %s=%s",
+    TString query(Form("SELECT %s FROM %s WHERE %s=%s",
                        column.Data(), table.Data(),
                        rc.GetValue(table+".Primary", ""),
@@ -90,5 +90,5 @@
 
     cout << "sequ: " << sequenceno.Data() << endl;
-    TString query(Form("SELECT fRunNumber FROM MyMagic.RunData WHERE fSequenceFirst=%s",
+    TString query(Form("SELECT fRunNumber FROM RunData WHERE fSequenceFirst=%s",
                        sequenceno.Data()));
 
Index: trunk/MagicSoft/Mars/datacenter/macros/checkstardone.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/checkstardone.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/checkstardone.C	(revision 7112)
@@ -45,5 +45,5 @@
 TString GetStatus(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString column)
 {
-    TString query(Form("SELECT %s FROM MyMagic.%s WHERE %s=%s",
+    TString query(Form("SELECT %s FROM %s WHERE %s=%s",
                        column.Data(), table.Data(),
                        rc.GetValue(table+".Primary", ""),
Index: trunk/MagicSoft/Mars/datacenter/macros/doexclusions.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/doexclusions.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/doexclusions.C	(revision 7112)
@@ -45,5 +45,5 @@
 int GetRunNumber(MSQLServer &serv, TString date, TString value)
 {
-    TString query(Form("SELECT %s(fRunNumber) FROM MyMagic.RunData ", value.Data()));
+    TString query(Form("SELECT %s(fRunNumber) FROM RunData ", value.Data()));
 
     if (date!="NULL")
@@ -77,5 +77,5 @@
 TString GetJoin(TString table)
 {
-    TString query(Form("left join MyMagic.%s ON RunData.f%sKEY=%s.f%sKEY ",
+    TString query(Form("left join %s ON RunData.f%sKEY=%s.f%sKEY ",
                        table.Data(), table.Data(), table.Data(), table.Data()));
     return query;
@@ -114,5 +114,5 @@
     TString runcond(Form("AND fRunNumber BETWEEN %d AND %d ", startrun, stoprun));
 
-    TString query="SELECT fExcludedFDAKEY from MyMagic.ExcludedFDA where fExcludedFDAAutomatic='yes'";
+    TString query="SELECT fExcludedFDAKEY from ExcludedFDA where fExcludedFDAAutomatic='yes'";
     TSQLResult *res = serv.Query(query);
     if (!res)
@@ -131,5 +131,5 @@
         TString border=rc.GetValue("key"+key+".SpecialRunCond", "");
 
-        TString query(Form("SELECT fExcludedFDAImportance from MyMagic.ExcludedFDA where fExcludedFDAKEY=%s ", key.Data()));
+        TString query(Form("SELECT fExcludedFDAImportance from ExcludedFDA where fExcludedFDAKEY=%s ", key.Data()));
         TSQLResult *res = serv.Query(query);
         if (!res)
@@ -150,5 +150,5 @@
         if (!join2.IsNull())
             query+=Form(", f%sName", join2.Data());
-        query +=" FROM MyMagic.RunData ";
+        query +=" FROM RunData ";
         query +=GetJoin("ExcludedFDA");
         if (!join1.IsNull())
@@ -177,5 +177,5 @@
             if (TString((*row2)[1]).IsNull() || atoi((*row2)[1])>newimp)
             {
-                TString query(Form("UPDATE MyMagic.RunData SET fExcludedFDAKEY=%s WHERE fRunNumber=%s",
+                TString query(Form("UPDATE RunData SET fExcludedFDAKEY=%s WHERE fRunNumber=%s",
                                    key.Data(), (*row2)[0]));
                 cout << "QU: " << query << endl;
Index: trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/fillcalib.C	(revision 7112)
@@ -235,7 +235,7 @@
 
     TString query;
-    if (!ExistStr(serv, "fSequenceFirst", "MyMagic.Calibration", seq))
-    {
-        query = Form("INSERT MyMagic.Calibration SET"
+    if (!ExistStr(serv, "fSequenceFirst", "Calibration", seq))
+    {
+        query = Form("INSERT Calibration SET"
                      " fSequenceFirst=%d,"
                      " fUnsuitableInner=%d, "
@@ -261,5 +261,5 @@
     else
     {
-        query = Form("UPDATE MyMagic.Calibration SET"
+        query = Form("UPDATE Calibration SET"
                      " fUnsuitableInner=%d, "
                      " fUnsuitableOuter=%d, "
Index: trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/filldotrbk.C	(revision 7112)
@@ -105,5 +105,5 @@
 {
 
-    if (ExistStr(serv, "fRunBookDate", "MyMagic.RunBook", date))
+    if (ExistStr(serv, "fRunBookDate", "RunBook", date))
         return 0;
 
@@ -116,5 +116,5 @@
             entry.Remove(i--);
 
-    TString query("INSERT MyMagic.RunBook (fRunBookDate, fRunBookText) VALUES (\"");
+    TString query("INSERT RunBook (fRunBookDate, fRunBookText) VALUES (\"");
     query += date;
     query += "\", \"";
Index: trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C	(revision 7112)
@@ -107,5 +107,5 @@
     TString query;
 
-    query = Form("SELECT f%sKEY FROM MyMagic.%s WHERE f%sName='%s'", col, col, col, name);
+    query = Form("SELECT f%sKEY FROM %s WHERE f%sName='%s'", col, col, col, name);
     TSQLResult *res = serv.Query(query);
     if (!res)
@@ -124,5 +124,5 @@
         return -1;
 
-    query = Form("INSERT MyMagic.%s (f%sName) VALUES (\"%s\");", col, col, name);
+    query = Form("INSERT %s (f%sName) VALUES (\"%s\");", col, col, name);
 
     if (dummy)
@@ -213,5 +213,5 @@
         //cout << "RunNo: " << runnumber << " ";
 
-        if (ExistStr(serv, "fRunNumber", "MyMagic.RunData", strng.Data()))
+        if (ExistStr(serv, "fRunNumber", "RunData", strng.Data()))
         {
             // FIXME: Maybe we can implement an switch to update mode?
@@ -528,5 +528,5 @@
         //assemlbe the query that is needed to insert the values of this run
         TString query;
-        query += "INSERT MyMagic.RunData SET ";
+        query += "INSERT RunData SET ";
 
         query += Form("fRunNumber=%d, ",  runnumber);
@@ -573,5 +573,5 @@
 
         //create entry in table RunProcessStatus for this runnumber
-        TString query2=Form("INSERT MyMagic.RunProcessStatus SET fRunNumber=%d, fTimingCorrection='1970-01-01 00:00:00'",
+        TString query2=Form("INSERT RunProcessStatus SET fRunNumber=%d, fTimingCorrection='1970-01-01 00:00:00'",
                     runnumber);
         res = serv.Query(query2);
Index: trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/fillsignal.C	(revision 7112)
@@ -128,5 +128,5 @@
     cout << "  Mean Ped RMS outer [phe] " << Form("%4.1f", meano) << endl; 
 
-    TString query = Form("UPDATE MyMagic.Calibration SET fMeanPedRmsInner=%s, "
+    TString query = Form("UPDATE Calibration SET fMeanPedRmsInner=%s, "
                          " fMeanPedRmsOuter=%s WHERE fSequenceFirst='%d' ",
                          meaninner.Data(), meanouter.Data(), seq);
Index: trunk/MagicSoft/Mars/datacenter/macros/fillstar.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 7112)
@@ -111,5 +111,8 @@
     }
 
-    Float_t psf = (h1->Integral(5, 14) - 0.759)/0.027;
+    //spline
+//    Float_t psf = (h1->Integral(5, 14) - 0.818)/0.0276;
+    //df
+    Float_t psf = (h1->Integral(5, 14) - 0.736)/0.0276;
     psf = TMath::Nint(psf*10)/10.;
     TString PSF = Form("%5.1f", psf);
@@ -124,5 +127,8 @@
 
     Float_t integral = h2->Integral(5, 14);
-    Float_t integralmc = -33.0*psf + 10517;
+    //spline
+//    Float_t integralmc = -36.06*psf + 11023;
+    //df
+    Float_t integralmc = -26.1*psf + 9750;
     Float_t ratiodatamc = (integral/integralmc)*100;
     TString ratio = Form("%5.1f", ratiodatamc);
@@ -171,7 +177,7 @@
 
     TString query;
-    if (!ExistStr(serv, "fSequenceFirst", "MyMagic.Star", seq))
-    {
-        query = Form("INSERT MyMagic.Star SET"
+    if (!ExistStr(serv, "fSequenceFirst", "Star", seq))
+    {
+        query = Form("INSERT Star SET"
                      " fSequenceFirst=%d,"
                      " fMeanNumberIslands=%s, "
@@ -187,5 +193,5 @@
     else
     {
-        query = Form("UPDATE MyMagic.Star SET"
+        query = Form("UPDATE Star SET"
                      " fMeanNumberIslands=%s, "
                      " fRatio=%s, "
Index: trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C	(revision 7112)
@@ -60,5 +60,5 @@
     cout << endl;
 
-    TString query="SELECT fRunNumber FROM MyMagic.RunProcessStatus WHERE IsNull(fCaCoFileFound) ";
+    TString query="SELECT fRunNumber FROM RunProcessStatus WHERE IsNull(fCaCoFileFound) ";
     query+=" and fRunNumber > 10000 and not IsNull(fCCFileAvail)";
 
Index: trunk/MagicSoft/Mars/datacenter/macros/getdolist.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/getdolist.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/getdolist.C	(revision 7112)
@@ -81,10 +81,10 @@
     }
 
-    TString query(Form("SELECT %s.%s FROM MyMagic.%s",
+    TString query(Form("SELECT %s.%s FROM %s",
                        table.Data(), rc.GetValue(table+".Primary", ""),
                        table.Data()));
 
     if (date!="NULL" && rc.GetValue(table+".TimerTable", "")!="")
-        query+=Form(" left join MyMagic.%s on %s.%s=%s.%s ",
+        query+=Form(" left join %s on %s.%s=%s.%s ",
                     rc.GetValue(table+".TimerTable", ""), table.Data(),
                     rc.GetValue(table+".Primary", ""),
Index: trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/insertcacofile.C	(revision 7112)
@@ -61,5 +61,5 @@
 
     Int_t newrunno=atoi(newrunnumber.Data());
-    TString query(Form("UPDATE MyMagic.RunProcessStatus SET fCaCoFileAvail=Now(), fCaCoFileFound=%d WHERE fRunNumber=%s ",
+    TString query(Form("UPDATE RunProcessStatus SET fCaCoFileAvail=Now(), fCaCoFileFound=%d WHERE fRunNumber=%s ",
                        newrunno, runnumber.Data()));
     cout << "qu: " << query << endl;
Index: trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C	(revision 7112)
@@ -63,5 +63,5 @@
     TString query;
 
-    query = Form("SELECT f%sKEY FROM MyMagic.%s WHERE f%sName='%s'", col, col, col, name);
+    query = Form("SELECT f%sKEY FROM %s WHERE f%sName='%s'", col, col, col, name);
     TSQLResult *res = serv.Query(query);
     if (!res)
@@ -80,5 +80,5 @@
         return -1;
 
-    query = Form("INSERT MyMagic.%s (f%sName) VALUES (\"%s\");", col, col, name);
+    query = Form("INSERT %s (f%sName) VALUES (\"%s\");", col, col, name);
 
     if (dummy)
@@ -130,7 +130,7 @@
     cout << "no:" << number << endl;
 
-    if (!ExistStr(serv, "fDataSetNumber", "MyMagic.DataSets", number.Data())) // Form("%d", number)
+    if (!ExistStr(serv, "fDataSetNumber", "DataSets", number.Data())) // Form("%d", number)
     {
-        TString query=Form("INSERT MyMagic.DataSets SET fDataSetNumber='%s', "
+        TString query=Form("INSERT DataSets SET fDataSetNumber='%s', "
                    " fSourceKEY=%d, fWobble='%s' ",
                    number.Data(), sourcekey, wobble.Data());
@@ -151,5 +151,5 @@
 
 
-        query=Form("INSERT MyMagic.DataSetProcessStatus SET fDataSetNumber='%s', "
+        query=Form("INSERT DataSetProcessStatus SET fDataSetNumber='%s', "
                    " fDataSetInserted=Now() ",
                    number.Data());
Index: trunk/MagicSoft/Mars/datacenter/macros/insertdate.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/insertdate.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/insertdate.C	(revision 7112)
@@ -79,7 +79,7 @@
     cout << endl;
 
-    if (!ExistStr(serv, "fDate", "MyMagic.SequenceBuildStatus", date))
+    if (!ExistStr(serv, "fDate", "SequenceBuildStatus", date))
     {
-        TString query(Form("INSERT MyMagic.SequenceBuildStatus SET fDate='%s', fCCFilled=Now() ",
+        TString query(Form("INSERT SequenceBuildStatus SET fDate='%s', fCCFilled=Now() ",
                            date.Data()));
 
@@ -96,5 +96,5 @@
         cout << date << " already exists... do update. " << endl;
 
-        TString query="UPDATE MyMagic.SequenceBuildStatus SET fCCFilled=Now(), fExclusionsDone=NULL, ";
+        TString query="UPDATE SequenceBuildStatus SET fCCFilled=Now(), fExclusionsDone=NULL, ";
         query +=Form("fSequenceEntriesBuilt=NULL WHERE fDate='%s' ", date.Data());
 
Index: trunk/MagicSoft/Mars/datacenter/macros/plotdb.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/plotdb.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/plotdb.C	(revision 7112)
@@ -339,6 +339,4 @@
     cout << endl;
 
-    serv.SelectDataBase("MyMagic");
-
     MStatusDisplay *d = new MStatusDisplay;
 
@@ -366,6 +364,4 @@
     cout << endl;
 
-    serv.SelectDataBase("MyMagic");
-
     MStatusDisplay *d = new MStatusDisplay;
 
Index: trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C	(revision 7112)
@@ -59,5 +59,5 @@
     cout << endl;
 
-    TString query(Form("UPDATE MyMagic.RunProcessStatus SET %s=NULL",
+    TString query(Form("UPDATE RunProcessStatus SET %s=NULL",
                        column.Data()));
     if (column.Contains("CaCo"))
@@ -90,5 +90,5 @@
             break;
 
-        TString query(Form("UPDATE MyMagic.RunProcessStatus SET %s=Now()", column.Data()));
+        TString query(Form("UPDATE RunProcessStatus SET %s=Now()", column.Data()));
 
         if (column.Contains("CaCo"))
Index: trunk/MagicSoft/Mars/datacenter/macros/resetcolumn.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/resetcolumn.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/resetcolumn.C	(revision 7112)
@@ -97,5 +97,5 @@
     }
 
-    TString query(Form("Update MyMagic.%s SET %s=NULL ", table.Data(), column.Data()));
+    TString query(Form("Update %s SET %s=NULL ", table.Data(), column.Data()));
 
     TIter Next(&l);
Index: trunk/MagicSoft/Mars/datacenter/macros/setstatus.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/setstatus.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/setstatus.C	(revision 7112)
@@ -66,5 +66,5 @@
 TString CheckDefault(MSQLServer &serv, TEnv &rc, TString primary, TString table, TString influence)
 {
-    TString query(Form("SELECT %s FROM MyMagic.%s WHERE %s=%s",
+    TString query(Form("SELECT %s FROM %s WHERE %s=%s",
                        influence.Data(), table.Data(),
                        rc.GetValue(table+".Primary", ""), primary.Data()));
@@ -99,5 +99,5 @@
     TString influences  = rc.GetValue(table+"."+column+".Influences", "");
 
-    TString query(Form("UPDATE MyMagic.%s SET %s=%s",
+    TString query(Form("UPDATE %s SET %s=%s",
                        table.Data(), column.Data(), value.Data()));
 
Index: trunk/MagicSoft/Mars/datacenter/macros/writesequencefile.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/writesequencefile.C	(revision 7111)
+++ trunk/MagicSoft/Mars/datacenter/macros/writesequencefile.C	(revision 7112)
@@ -219,5 +219,5 @@
 TString GetName(MSQLServer &serv, const char *col, const char *n)
 {
-    TString query(Form("SELECT f%sName FROM MyMagic.%s WHERE f%sKEY=%s",
+    TString query(Form("SELECT f%sName FROM %s WHERE f%sKEY=%s",
                        col, col, col, n));
     
@@ -283,5 +283,5 @@
 
     TString query(Form("SELECT fRunNumber, fRunTypeKEY, fRunStart, fRunStop, fNumEvents"
-                       " FROM MyMagic.RunData WHERE fSequenceFirst=%s AND fExcludedFDAKEY=1"
+                       " FROM RunData WHERE fSequenceFirst=%s AND fExcludedFDAKEY=1"
                        " ORDER BY fRunNumber",
                        data[0]));
@@ -328,5 +328,5 @@
                        " fL1TriggerTableKEY, fL2TriggerTableKEY, fHvSettingsKEY, "
                        " fLightConditionsKEY, fRunStart, fNumEvents"
-                       " FROM MyMagic.Sequences WHERE fSequenceFirst=%d", sequno));
+                       " FROM Sequences WHERE fSequenceFirst=%d", sequno));
     TSQLResult *res = serv.Query(query);