Changeset 7182 for trunk/MagicSoft


Ignore:
Timestamp:
07/12/05 15:28:51 (19 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7181 r7182  
    2121
    2222                                                 -*-*- END OF LINE -*-*-
     23
     24 2005/07/12 Daniela Dorner
     25
     26   * automatic-exclusions.rc:
     27     - added two automatic exclusions
     28
     29   * datacenter/macros/findcacofiles.C:
     30     - adapted query to ensure, that only existing caco-files are
     31       searched
     32
     33   * datacenter/macros/getdolist.C:
     34     - changed query to make sure, that new data is processed first
     35
     36   * datacenter/macros/resetallruns.C:
     37     - changed query to allow manual interaction in RunProcessStatus
     38
     39   * datacenter/scripts/runganymed:
     40     - fixed bug in choice of rc-file
     41
     42
    2343
    2444 2005/07/12 Thomas Bretz

  • trunk/MagicSoft/Mars/automatic-exclusions.rc

    r6933 r7182  
    2121key17.Cond: fProjectName like '%test%'
    2222#key17.SpecialRunCond:
     23
     24#FlagIsTest:
     25key24.Join1: TestFlag
     26#key24.Join2:
     27key24.Cond: fTestFlagName='Test'
     28#key24.SpecialRunCond:
    2329
    2430#ProjectLikeClose:
    … …  
    4955key3.Join1: Project
    5056key3.Join2: CalibrationScript
    51 key3.Cond: fProjectName like binary '%CL%' or fCalibrationScriptName='100_ContinuosLight'
     57key3.Cond: fProjectName like binary '%CL%' or fCalibrationScriptName like '%ContinuosLight'
    5258#key3.SpecialRunCond:
    5359

  • trunk/MagicSoft/Mars/datacenter/macros/findcacofiles.C

    r7112 r7182  
    6060    cout << endl;
    6161
    62     TString query="SELECT fRunNumber FROM RunProcessStatus WHERE IsNull(fCaCoFileFound) ";
    63     query+=" and fRunNumber > 10000 and not IsNull(fCCFileAvail)";
     62    TString query="SELECT RunProcessStatus.fRunNumber FROM RunProcessStatus ";
     63    query+=" LEFT JOIN RunData on RunData.fRunNumber=RunProcessStatus.fRunNumber ";
     64    query+=" WHERE IsNull(fCaCoFileFound) and fExcludedFDAKEY=1 ";
     65    query+=" and RunProcessStatus.fRunNumber > 10000 and not IsNull(fCCFileAvail)";
    6466
    6567    TSQLResult *res = serv.Query(query);

  • trunk/MagicSoft/Mars/datacenter/macros/getdolist.C

    r7112 r7182  
    110110    }
    111111
     112    query+=Form(" ORDER BY %s.%s DESC ", table.Data(), rc.GetValue(table+".Primary", ""));
     113
    112114    cout << "query: " << query << endl;
    113115

  • trunk/MagicSoft/Mars/datacenter/macros/resetallruns.C

    r7112 r7182  
    9595            query+=Form(", fCaCoFileFound=%d", atoi(runnumber));
    9696
    97         query+=Form(" WHERE fRunNumber=%d ", atoi(runnumber));
     97        query+=Form(" WHERE fRunNumber=%d and %s!='1970-01-01 00:00:00'", atoi(runnumber), column.Data());
    9898
    9999        cout << "q2: " << query << endl;

  • trunk/MagicSoft/Mars/datacenter/scripts/runganymed

    r7141 r7182  
    3636datetime=`date +%F-%H-%M-%S`
    3737year=`date +%Y`
    38 pno=4 # number of processes, i.e. number of todo-files
     38pno=24 # number of processes, i.e. number of todo-files
    3939
    4040todofile=$listpath/ToDo-$table-$column
    … …  
    184184  wobble=`grep 'WobbleMode:' $datasetfile` >> $scriptlog 2>&1
    185185  wobble2=`echo $wobble | grep ^\#` >> $scriptlog 2>&1
    186   if [ "$mode2" = "" ]
     186  if [ "$wobble2" = "" ]
    187187  then
    188188     mode="wobble" >> $scriptlog 2>&1
Note: See TracChangeset for help on using the changeset viewer.