/[PAMELA software]/PadmeAmidala/src/PadmeAmidala.cpp
ViewVC logotype

Diff of /PadmeAmidala/src/PadmeAmidala.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by mocchiut, Mon Oct 20 12:13:01 2014 UTC revision 1.14 by mocchiut, Mon Oct 20 12:27:56 2014 UTC
# Line 298  int main(int numinp, char *inps[]){ Line 298  int main(int numinp, char *inps[]){
298      //      //
299      l = rg->GetRunList();      l = rg->GetRunList();
300      //      //
301      if ( rg->HasDiscardedRuns() && pedantic ) exit(10);      if ( l && !(rg->HasDiscardedRuns() && pedantic) ){
     if ( l ){  
302        //        //
 //      if ( rg->OpenFile() ){  
303        if ( rg->FileIsOpen() ){        if ( rg->FileIsOpen() ){
304          //          //
305          rg->MergeRootfile(l);          rg->MergeRootfile(l);
# Line 317  int main(int numinp, char *inps[]){ Line 315  int main(int numinp, char *inps[]){
315        };        };
316      } else {      } else {
317        RET = 255;        RET = 255;
318      };        if (rg->HasDiscardedRuns() && pedantic){
319            printf(" Missing runs (and pedantic selected), cannot merge file %s \n",rg->GetFilename().Data());
320            rg->Clean();
321          }
322        }
323      delete l;      delete l;
324      //      //
325    };    }
326    //    //
327    delete rg;    delete rg;
328    //    //
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14
  ViewVC Help
Powered by ViewVC 1.1.23