Changeset 17315 for trunk/Mars/fact

Timestamp:

11/06/13 12:54:35 (11 years ago)

Author:

Daniela Dorner

Message:

changed column name from fRunId to fRunID

File:

• trunk/Mars/fact/analysis/lightcurve.C (modified) (5 diffs)

trunk/Mars/fact/analysis/lightcurve.C

@@ -48 +48 @@
     TString query;
     query=Form("SELECT Min(fNight), Max(fNight) FROM %s ", table.Data());
-    query+=" LEFT JOIN RunInfo USING(fNight, fRunId) ";
+    query+=" LEFT JOIN RunInfo USING(fNight, fRunID) ";
     query+=Form(" WHERE fSourceKey=%d", sourcekey);
     if (nightmin)
@@ -60 +60 @@
     datacheck+=" AND fNight>20120420 AND NOT fNight IN (20120406,20120410,20120503) AND";//data with different bias voltage
     datacheck+=" NOT fNight BETWEEN 20121206 AND 20130110"; // broken bias channel
-    //datacheck+=" AND NOT (fNight=20120608 AND fRunId=65) "; // something went wrong with tracking?
+    //datacheck+=" AND NOT (fNight=20120608 AND fRunID=65) "; // something went wrong with tracking?
     // 24.6. new coefficients
     TString zdparam=" pow(0.753833 * cos(Radians(fZenithDistanceMean)), 7.647435) * exp(-5.753686*pow(Radians(fZenithDistanceMean),2.089609))";
@@ -84 +84 @@
 
     query =" SELECT fNight FROM "+table;
-    query+=" LEFT JOIN RunInfo USING(fNight, fRunId) ";
+    query+=" LEFT JOIN RunInfo USING(fNight, fRunID) ";
     query+=Form(" WHERE fSourceKey=%d", sourcekey);
     query+=Form(" AND fNight BETWEEN %s AND %s ", nightstart.Data(), nightstop.Data());
@@ -167 +167 @@
         query+=" fZenithDistanceMax, fZenithDistanceMin, ";
         query+=" fCurrentsMedMeanBeg, fThresholdMinSet FROM "+table;
-        query+=" LEFT JOIN RunInfo USING(fNight, fRunId) ";
+        query+=" LEFT JOIN RunInfo USING(fNight, fRunID) ";
         query+=Form(" WHERE fSourceKey=%d", sourcekey);
         query+=Form(" AND fNight= %s ", (*row3)[0]);
@@ -176 +176 @@
             query+=datacheck;
 
-        query+=" ORDER BY fRunId ";
+        query+=" ORDER BY fRunID ";
 
         cout << "Q: " << query << endl;