Changeset 8220 for trunk/MagicSoft


Ignore:
Timestamp:
12/11/06 14:40:14 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

    r7898 r8220  
    287287  if (fSequence.IsValid())
    288288    {
    289       const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, IsUseRawData());
    290       const Int_t n1 = fSequence.GetNumCalRuns();
    291       if (n0==0)
    292         {
    293           *fLog << err << "ERROR - No input files of sequence found!" << endl;
    294           return kFALSE;
    295         }
    296       if (n0!=n1)
    297         {
    298           *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
    299             if (fLog->GetDebugLevel()>4)
    300             {
    301                 *fLog << dbg << "Files which are searched:" << endl;
    302                 iter.Print();
    303             }
    304           return kFALSE;
    305         }
     289        if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0)
     290            return kFALSE;
    306291    }
    307292 

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8219 r8220  
    246246    if (fSequence.IsValid())
    247247    {
    248         const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, IsUseRawData());
    249         const Int_t n1 = fSequence.GetNumDatRuns();
    250         if (n0==0)
    251         {
    252             *fLog << err << "ERROR - No input files for sequence found in " << (fPathData.IsNull()?"<default>":fPathData.Data()) << "." << endl;
     248        if (fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())<=0)
    253249            return kFALSE;
    254         }
    255         if (n0!=n1)
    256         {
    257             *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
    258             if (fLog->GetDebugLevel()>4)
    259             {
    260                 *fLog << dbg << "Files which are searched:" << endl;
    261                 iter.Print();
    262             }
    263             return kFALSE;
    264         }
    265250    }
    266251

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r8219 r8220  
    16981698
    16991699    MDirIter iter;
    1700     const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, IsUseRawData());
    1701     const Int_t n1 = fSequence.GetNumCalRuns();
    1702     if (n0==0)
    1703     {
    1704         *fLog << err << "ERROR - No input files for sequence found in " << (fPathData.IsNull()?"<default>":fPathData.Data()) << "." << endl;
     1700    if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0)
    17051701        return kFALSE;
    1706     }
    1707     if (n0!=n1)
    1708     {
    1709         *fLog << err << "ERROR - Number of files found ("
    1710             << n0 << ") doesn't match number of files in sequence ("
    1711             << n1 << ")" << endl;
    1712         if (fLog->GetDebugLevel()>4)
    1713         {
    1714             *fLog << dbg << "Files which are searched:" << endl;
    1715             iter.Print();
    1716         }
    1717         return kFALSE;
    1718     }
    17191702
    17201703    //

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r8154 r8220  
    10221022    if (fSequence.IsValid())
    10231023    {
    1024         const Int_t n0 = IsUseData()
    1025           ? fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())
    1026           : fSequence.SetupPedRuns(iter, fPathData, IsUseRawData());
    1027         const Int_t n1 = IsUseData()
    1028           ? fSequence.GetNumDatRuns()
    1029           : fSequence.GetNumPedRuns();
    1030         if (n0==0)
    1031         {
    1032             *fLog << err << "ERROR - No " << type << " input files of sequence found in " << (fPathData.IsNull()?"<default>":fPathData.Data()) << endl;
     1024        const Int_t n0 = IsUseData()
     1025            ? fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())
     1026            : fSequence.SetupPedRuns(iter, fPathData, IsUseRawData());
     1027
     1028        if (n0<=0)
    10331029            return kFALSE;
    1034         }
    1035         if (n0!=n1)
    1036         {
    1037             *fLog << err << "ERROR - Number of " << type << " files found (" << n0 << ") in " << (fPathData.IsNull()?"<default>":fPathData.Data())  << " doesn't match number of files in sequence (" << n1 << ")" << endl;
    1038             if (fLog->GetDebugLevel()>4)
    1039             {
    1040                 *fLog << dbg << "Files which are searched:" << endl;
    1041                 iter.Print();
    1042             }
    1043             return kFALSE;
    1044         }
    10451030    }
    10461031

  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r8219 r8220  
    142142
    143143    MDirIter iter;
    144     const Int_t n0 = fSequence.SetupDatRuns(iter, MSequence::kCalibrated, fPathData);
    145     const Int_t n1 = fSequence.GetNumDatRuns();
    146     if (n0==0)
    147     {
    148         *fLog << err << "ERROR - No input files for sequence found in " << (fPathData.IsNull()?"<default>":fPathData.Data()) << endl;
    149         return kFALSE;
    150     }
    151     if (n0!=n1)
    152     {
    153         *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
    154         if (fLog->GetDebugLevel()>4)
    155         {
    156             *fLog << dbg << "Files which are searched:" << endl;
    157             iter.Print();
    158         }
    159         return kFALSE;
    160     }
     144    if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated, fPathData)<=0)
     145        return kFALSE;
    161146
    162147    // Setup Parlist
Note: See TracChangeset for help on using the changeset viewer.