Changeset 14149 for trunk/Mars

Timestamp:

06/11/12 00:39:33 (12 years ago)

Author:

Daniela Dorner

Message:

adapted for new checksums

Location:

trunk/Mars/datacenter/db

Files:

• fact_runinfo.php (modified) (3 diffs)
• factdefs.php (modified) (1 diff)

trunk/Mars/datacenter/db/fact_runinfo.php

@@ -194 +194 @@
             $_GET["if(fHasDrsFile=0,\"N\",fDrsStep)"]=$first?"Off":"";
 
-        if (empty($_GET["fMd5sumRaw"]))
-            $_GET["fMd5sumRaw"]=$first?"Off":"";
-
-        if (empty($_GET["fMd5sumRawZip"]))
-            $_GET["fMd5sumRawZip"]=$first?"Off":"";
+        if (empty($_GET["if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))"]))
+            $_GET["if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))"]=$first?"Off":"";
 
         if (empty($_GET["fRunTypeName"]))
@@ -246 +243 @@
         CheckBox("fRunStop",                      "stop time");
         CheckBox("TimeDiff(fRunStop,fRunStart)",  "duration");
+        CheckBox("fNumEvents",                    "#Evts");
         CheckBox("fROI",                          "roi");
-        CheckBox("fNumEvents",                    "#Evts");
 
         printf("  </tr>\n");
@@ -269 +266 @@
         printf("  <tr>\n");
 
+        CheckBox("fTriggerRateMedian",    "rate");
+        CheckBox("fThresholdMedian",      "threshold");
+        CheckBox("fBiasVoltageMedian",    "voltage");
+        CheckBox("if(fHasDrsFile=0,\"N\",fDrsStep)", "drs");
         CheckBox("fROITimeMarker",                   "roi-tm");
+
+        printf("  </tr>\n");
+        printf("  <tr>\n");
+
+        CheckBox("fZenithDistanceMean",   "ZdMean");
+        CheckBox("fAzimuthMean",          "AzMean");
+        CheckBox("fRightAscension",       "RA");
+        CheckBox("fDeclination",          "Dec");
+
+        printf("  </tr>\n");
+        printf("  <tr>\n");
+
         CheckBox("fFitsFileErrors",                  "file err");
         CheckBox("fCompileTime",                     "compiled");
         CheckBox("fRevisionNumber",                  "rev#");
-        CheckBox("if(fHasDrsFile=0,\"N\",fDrsStep)", "drs");
-        CheckBox("fMd5sumRaw",                       "md5");
-        CheckBox("fMd5sumRawZip",                    "md5(gz)");
-
-        printf("  </tr>\n");
-        printf("  <tr>\n");
-
-        CheckBox("fTriggerRateMedian",    "rate");
-        CheckBox("fThresholdMedian",      "threshold");
-        CheckBox("fBiasVoltageMedian",    "voltage");
-        CheckBox("fRightAscension",       "RA");
-        CheckBox("fDeclination",          "Dec");
-        CheckBox("fZenithDistanceMean",   "ZdMean");
-        CheckBox("fAzimuthMean",          "AzMean");
+        CheckBox("if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))",  "checksum");
 
         printf("  </tr>\n");

trunk/Mars/datacenter/db/factdefs.php

@@ -18 +18 @@
      "Run"                              => "Run",
      "fRunTypeName"                     => "RunType",
-     "fMd5sumRaw"                       => "md5",
-     "fMd5sumRawZip"                    => "md5(zip)",
+     "if(!isnull(fCheckSum)+!isnull(fDataSum),Concat(fCheckSum,\"/\",fDataSum),Concat(fMd5sumRaw,\"/\",fMd5sumRawZip))" => "checksum",
      "fROI"                             => "roi",
      "fROITimeMarker"                   => "roi-tm",