Changeset 9194


Ignore:
Timestamp:
Dec 19, 2008, 3:56:10 PM (12 years ago)
Author:
hoehne
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9191 r9194  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2008/12/19 Daniel Hoehne-Moench
     22
     23   * datacenter/macros/filldotrun.C:
     24     - implemented SuperArehucas version 081204-0 incl. sumtrigger flag
     25   * datacenter/db/magicdefs.php, datacenter/db/menu.php:
     26     - implemented sumtrigger flag (in runinfo and sequinfo menus)
     27
     28
    2029
    2130 2008/12/09 Thomas Bretz
  • trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

    r9150 r9194  
    7474     "fManuallyChangedName"              => CheckWhere("fManuallyChangedKEY",              $_GET),
    7575     "fObservationModeName"              => CheckWhere("fObservationModeKEY",              $_GET),
     76     "fSumTriggerFlagName"               => CheckWhere("fSumTriggerFlagKEY",               $_GET),
    7677     "fDiscriminatorThresholdTableName"  => CheckWhere("fDiscriminatorThresholdTableKEY",  $_GET),
    7778     "fTriggerDelayTableName"            => CheckWhere("fTriggerDelayTableKEY",            $_GET),
     
    100101     "fManuallyChangedName"              => CheckGroup("fManuallyChangedKEY",              $_GET),
    101102     "fObservationModeName"              => CheckGroup("fObservationModeKEY",              $_GET),
     103     "fSumTriggerFlagName"               => CheckGroup("fSumTriggerFlagKEY",              $_GET),
    102104     "fDiscriminatorThresholdTableName"  => CheckGroup("fDiscriminatorThresholdTableKEY",  $_GET),
    103105     "fTriggerDelayTableName"            => CheckGroup("fTriggerDelayTableKEY",            $_GET),
     
    167169     "fManuallyChangedName"             => "Manually<br>Changed",
    168170     "fObservationModeName"             => "Obs.<br>Mode",
     171     "fSumTriggerFlagName"              => "SumTrigger<br>Flag",
    169172     "fLastUpdate"                      => "LastUpd",
    170173     "fSequenceFirst"                   => "Sequ",
     
    483486         "fManuallyChangedName"              => $fromtable . ".fManuallyChangedKEY",
    484487         "fObservationModeName"              => $fromtable . ".fObservationModeKEY",
     488         "fSumTriggerFlagName"               => $fromtable . ".fSumTriggerFlagKEY",
    485489         "fDiscriminatorThresholdTableName"  => $fromtable . ".fDiscriminatorThresholdTableKEY",
    486490         "fTriggerDelayTableName"            => $fromtable . ".fTriggerDelayTableKEY",
     
    538542         "fManuallyChangedName"              => "ManuallyChanged.fManuallyChangedName",
    539543         "fObservationModeName"              => "ObservationMode.fObservationModeName",
     544         "fSumTriggerFlagName"               => "SumTriggerFlag.fSumTriggerFlagName",
    540545         "fTriggerDelayTableName"            => "TriggerDelayTable.fTriggerDelayTableName",
    541546         "fDiscriminatorThresholdTableName"  => "DiscriminatorThresholdTable.fDiscriminatorThesholdTableName",
     
    703708         "fManuallyChangedName"             => " LEFT JOIN ManuallyChanged             USING(fManuallyChangedKEY) ",
    704709         "fObservationModeName"             => " LEFT JOIN ObservationMode             USING(fObservationModeKEY) ",
     710         "fSumTriggerFlagName"              => " LEFT JOIN SumTriggerFlag              USING(fSumTriggerFlagKEY) ",
    705711         "fDiscriminatorThresholdTableName" => " LEFT JOIN DiscriminatorThresholdTable USING(fDiscriminatorThresholdTableKEY) ",
    706712         "fTriggerDelayTableName"           => " LEFT JOIN TriggerDelayTable           USING(fTriggerDelayTableKEY) ",
  • trunk/MagicSoft/Mars/datacenter/db/menu.php

    r9184 r9194  
    9393    printf("  </td><td>\n");
    9494    PrintPullDown($host, $user, $pw, $db, "ObservationMode",   "fObservationModeName", "fObservationModeKEY", "Obs. Mode");
     95    printf("  </td><td>\n");
     96    printf("  </td><td>\n");
     97    PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag",   "fSumTriggerFlagName", "fSumTriggerFlagKEY", "SumTrigger Flag");
    9598    printf(" </td></tr></table>\n");
    9699    printf(" </div><p>\n");
     
    155158    printf("  </td><td>\n");
    156159    PrintPullDown($host, $user, $pw, $db, "TriggerDelayTable",           "fTriggerDelayTableName",           "fTriggerDelayTableKEY",           "Trigger Delay Table");
     160    printf("  </td></tr><tr><td>\n");
     161    printf("  </td><td>\n");
     162    printf("  </td><td>\n");
     163    PrintPullDown($host, $user, $pw, $db, "SumTriggerFlag",              "fSumTriggerFlag",                  "fSumTriggerFlagKEY",              "SumTrigger Flag");
    157164//    printf("  </td><td>\n");
    158165//    PrintPullDown($host, $user, $pw, $db, "ManuallyChanged",             "fManuallyChangedName",             "fManuallyChangedKEY",             "Manually changed");
     
    731738        $_GET["fObservationModeName"]="Off";
    732739
     740    if (empty($_GET["fSumTriggerFlagName"]))
     741        $_GET["fSumTriggerFlagName"]="Off";
     742
    733743    if (empty($_GET["fMeanTriggerRate"]))
    734744        $_GET["fMeanTriggerRate"]="Off";
     
    9951005        $_GET["fObservationModeName"]="Off";
    9961006
     1007    if (empty($_GET["fSumTriggerFlagName"]))
     1008        $_GET["fSumTriggerFlagName"]="Off";
     1009
    9971010//    if (empty($_GET["fManuallyChangedName"]))
    9981011//        $_GET["fManuallyChangedName"]="Off";
  • trunk/MagicSoft/Mars/datacenter/macros/filldotrun.C

    r9139 r9194  
    4141//   060330-0, 060401-0, 060808-0
    4242//   070416-0,
    43 //   080220-0, 080519-0, 080912-0
     43//   080220-0, 080519-0, 080912-0, 081204-0
    4444//
    4545// Usage:
     
    123123        version!=200603300 && version!=200604010 && version!=200608080 &&
    124124        version!=200704160 &&
    125         version!=200802200 && version!=200805190 && version!=200809120)
     125        version!=200802200 && version!=200805190 && version!=200809120 &&
     126        version!=200812040)
    126127    {
    127128        cout << filename << ": File Version unknown - please update the macro!" << endl;
     
    537538                strng.ReadToDelim(fin, ' ');
    538539            }
     540            if (version<=200809120)
     541                strng.ReadToDelim(fin, '\n');
     542            else
     543                strng.ReadToDelim(fin, ' ');
     544        }
     545
     546        Int_t sumtriggerflagkey=1;
     547        if (version>=200812040)
     548        {
     549            // ========= Col 52: SumTrigger flag =========
    539550            strng.ReadToDelim(fin, '\n');
     551            if (strng.Contains("???"))
     552                strng="n/a";
     553
     554            sumtriggerflagkey = serv.QueryKeyOfName("SumTriggerFlag", strng);
     555            if (sumtriggerflagkey<0)
     556            {
     557                strng.ReadLine(fin);
     558                continue;
     559            }
     560
    540561        }
    541562
     
    545566        // ================================================================
    546567
    547         //assemlbe the query that is needed to insert the values of this run
     568        //assemble the query that is needed to insert the values of this run
    548569        TString query;
    549570        query += Form("fTelescopeNumber=%d, ", telnumber);
     
    555576        query += Form("fNumEvents=%d, ",       evtno);
    556577        query += Form("fRunStart=\"%s %s\", ", startdate.Data(), starttime.Data());
    557         query += Form("fRunStop=\"%s %s\", ", stopdate.Data(), stoptime.Data());
    558         query += Form("fL1TriggerTableKEY=%d, ", l1triggerkey);
    559         query += Form("fL2TriggerTableKEY=%d, ", l2triggerkey);
    560         query += Form("fTestFlagKEY=%d, ", testflagkey);
     578        query += Form("fRunStop=\"%s %s\", ",  stopdate.Data(), stoptime.Data());
     579        query += Form("fL1TriggerTableKEY=%d, ",    l1triggerkey);
     580        query += Form("fL2TriggerTableKEY=%d, ",    l2triggerkey);
     581        query += Form("fTestFlagKEY=%d, ",          testflagkey);
    561582        query += Form("fCalibrationScriptKEY=%d, ", calibrationscriptkey);
    562583        query += Form("fTriggerDelayTableKEY=%d, ", triggerdelaytablekey);
    563584        query += Form("fDiscriminatorThresholdTableKEY=%d, ", dttablekey);
    564         query += Form("fLightConditionsKEY=%d, ", lightcondkey);
    565         query += Form("fHvSettingsKEY=%d, ", hvkey);
    566         query += Form("fObservationModeKEY=%d, ", observationmodekey);
     585        query += Form("fLightConditionsKEY=%d, ",   lightcondkey);
     586        query += Form("fHvSettingsKEY=%d, ",        hvkey);
     587        query += Form("fObservationModeKEY=%d, ",   observationmodekey);
     588        query += Form("fSumTriggerFlagKEY=%d, ",    sumtriggerflagkey);
    567589        if (!TMath::IsNaN(zd) && TMath::Finite(zd))
    568590            query += Form("fZenithDistance=%d, ", TMath::Nint(zd));
Note: See TracChangeset for help on using the changeset viewer.