Changeset 18308


Ignore:
Timestamp:
08/31/15 00:37:40 (6 years ago)
Author:
Daniela Dorner
Message:
bugfix (start and stop in regular expressions of sequences.rc were ignored)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/processing/buildseqentries.C

    r18134 r18308  
    136136        if (arr.GetEntries()>2)
    137137            fMax = GetId(arr[2]->GetName());
     138        cout << "----> " << fMin << " " << fMax << endl;
    138139    }
    139140
     
    217218        if (run>0)
    218219        {
     220            cout << " - - > " << run << endl;
    219221            if (run<fMin || run>fMax)
    220222                return kFALSE;
     
    915917    }
    916918
    917     TString PrepareString(TSQLResult &res, TArrayL &runs)
     919    TString PrepareString(TSQLResult &res, TArrayL &runs, TArrayL &nights)
    918920    {
    919921        // Number of result rows
     
    921923
    922924        runs.Set(rows);       // initialize size of array for run numbers
     925        nights.Set(rows);       // initialize size of array for nights
    923926
    924927        TArrayD start(rows);  // instantiate array for start times
     
    932935        {
    933936            runs[idx] = atol((*row)[0]);          // run number
     937            nights[idx] = atol((*row)[4]);          // night
    934938
    935939            const TString tstart = ((*row)[2]);   // start time
     
    10211025        /*const*/
    10221026        TString query =
    1023             "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop"
     1027            "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop, fNight*1000 "
    10241028            " FROM RunInfo WHERE fExcludedFDAKEY=1 AND ";
    10251029        query += Form("fRunID BETWEEN %ld AND %ld AND "
     
    10381042        // and an array with the corresponding run-numbers
    10391043        TArrayL runs;
    1040         const TString str = PrepareString(*res, runs);
     1044        TArrayL nights;
     1045        const TString str = PrepareString(*res, runs, nights);
    10411046
    10421047        delete res;
     
    10711076            {
    10721077                // Check if regular expressions matchs
    1073                 const Ssiz_t len = obj->Match(str, pos, runs[pos]);
     1078                const Ssiz_t len = obj->Match(str, pos, nights[pos]);
    10741079                if (len>0)
    10751080                {
Note: See TracChangeset for help on using the changeset viewer.