Changeset 19733


Ignore:
Timestamp:
Oct 7, 2019, 1:35:30 PM (11 days ago)
Author:
dorner
Message:
added new options (cut on correction-factors, cut for rows with empty values)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/dch/download.php

    r19097 r19733  
    2020}
    2121$maintenance=0;
    22 //$maintenance=1;
     22$maintenance=1;
    2323
    2424if ($maintenance)
    2525{
    2626    echo "<hr>\n <p style='font-size:xx-large'> MAINTENANCE ONGOING </p>\n";
    27     echo "<p>check again in a few hours...</p>\n<p>\n<hr>\n<p>\n<p>\n";
     27    echo "<p>check again later...</p>\n<p>\n<hr>\n<p>\n<p>\n";
    2828}
    2929
    3030
    3131$tables=array(
    32       "AnalysisResultsRunLP"   => "QLA",
    33       "AnalysisResultsRunISDC" => "ISDC",
     32      "AnalysisResultsRunLP"     => "QLA",
     33      "AnalysisResultsRunISDC"   => "ISDC",
     34      "AnalysisResultsRunCutsLC" => "CutsLC",
    3435      );
    3536
     
    6566      );
    6667
     68$rmemptyrows=array(
     69      "no"    => "all data",
     70      "yes"   => "remove rows with empty columns",
     71      );
     72
    6773$dusts=array(
    6874      "all"  => "all data",
     
    7076      "10"    => "dust<10",
    7177      "1.0"   => "dust<1",
     78      );
     79
     80$factorcuts=array(
     81      "all"   => "all data",
     82      "0.1"   => "zdfactor * thfactor > 0.1",
     83      "0.2"   => "zdfactor * thfactor > 0.2",
     84      "0.3"   => "zdfactor * thfactor > 0.3",
     85      "0.4"   => "zdfactor * thfactor > 0.4",
     86      "0.5"   => "zdfactor * thfactor > 0.5",
     87      "0.6"   => "zdfactor * thfactor > 0.6",
     88      "0.7"   => "zdfactor * thfactor > 0.7",
     89      "0.8"   => "zdfactor * thfactor > 0.8",
     90      "0.9"   => "zdfactor * thfactor > 0.9",
    7291      );
    7392
     
    152171    $time="novalue";
    153172
     173if (!empty($_POST["factorcut"]))
     174    $factorcut=$_POST["factorcut"];
     175else
     176    $factorcut="novalue";
     177
    154178if (!empty($_POST["table"]))
    155179    $table=$_POST["table"];
    156180else
    157181    $table="AnalysisResultsRunLP";
     182
     183if (!empty($_POST["rmemptyrow"]))
     184    $rmemptyrow=$_POST["rmemptyrow"];
     185else
     186    $rmemptyrow="no";
    158187
    159188if (!empty($_POST["th"]))
     
    248277    print_popup("Please provide an email address.");
    249278
    250 if (empty($_POST["emailcopy"]))
     279
     280if (strpos($email, "@")!= false && empty($_POST["emailcopy"]))
    251281    print_popup("Please agree that a copy of the email is stored.");
    252282
     
    258288    print_popup("Email with data sent to ".$email);
    259289    if ($maintenance)
    260         echo $start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust."<br>\n";
    261     $sent=shell_exec("/users/fact/SW.automatic.processing/DataCheck/Tools/get_data.sh ".$start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust);
     290        echo $start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust." ".$rmemptyrow." ".$factorcut."<br>\n";
     291    $sent=shell_exec("/users/fact/SW.automatic.processing/DataCheck/Tools/get_data.sh ".$start." ".$stop." ".$source." ".$timebin." ".$email." ".$table." ".$time." ".$expert." ".$dch." ".$zd." ".$th." ".$light." ".$dust." ".$rmemptyrow." ".$factorcut);
    262292    echo $sent;
    263293    if (!empty($_POST["newsletter"]))
     
    431461            printf("<option value='%s'>%s</option>\n", $key, $name);
    432462    }
     463    echo "</select>\n";
     464
     465    echo "<select name='factorcut' size='1'>\n";
     466    if ($factorcut == "novalue")
     467        printf("<option value='novalue' selected>Select Factor-Cut</option>\n");
     468    else
     469        printf("<option value='novalue'>Select Factor-Cut</option>\n");
     470    foreach ($factorcuts as $key => $name)
     471    {
     472        if ($factorcut == $key)
     473            printf("<option value='%s' selected>%s</option>\n", $key, $name);
     474        else
     475            printf("<option value='%s'>%s</option>\n", $key, $name);
     476    }
     477    echo "</select>\n";
     478
     479    echo "<select name='rmemptyrows' size='1'>\n";
     480    foreach ($rmemptyrows as $key => $name)
     481    {
     482        if ($rmemptyrow == $key)
     483            printf("<option value='%s' selected>%s</option>\n", $key, $name);
     484        else
     485            printf("<option value='%s'>%s</option>\n", $key, $name);
     486    }
    433487    echo "</select>\n <br>\n";
    434488}
     
    466520    echo "<ul>\n";
    467521    echo "<li>The correction formula to correct the excess rate for the effects of zd and threshold is not yet final.</li>\n";
    468     echo "<li>The CU conversion is currently only valid for QLA and until summer 2016.</li>\n";
    469     echo "<li>The data quality selection based on the artificial trigger rate R750 might not work for all data (effect of lidar).</li>\n";
     522    //echo "<li>The CU conversion is currently only valid for QLA and until summer 2016.</li>\n";
     523    echo "<li>The data quality selection based on the artificial trigger rate R750 \n";
     524    echo "<ul>\n";
     525    echo "<li>might not work for all data (effect of lidar).</li>\n";
     526    echo "<li>might not be available for the newest data (reference value needs to be determined).</li>\n";
     527    echo "</ul></li>\n";
     528    echo "<li>Not for all data dust measurements are available.</li>\n";
    470529    //echo "<li></li>\n";
    471530    echo "</ul>";
Note: See TracChangeset for help on using the changeset viewer.