Changeset 9288 for trunk/MagicSoft/Mars

Timestamp:

02/02/09 10:31:37 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (1 diff)
• MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -380 +380 @@
     read->AddFiles(iter);
 
-    const TString fname(Form("s/([0-9]+_[0-9]+)_D_(.*[.])(raw([.]gz)?)$/%s\\/$1_Y_$2root/",
+    const TString fname(Form("s/([0-9]+(_M[12])?_[0-9.]+)_D_(.*[.])(raw([.]gz)?)$/%s\\/$1_Y_$3root/",
                              Esc(fPathOut).Data()));
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -300 +300 @@
     // Effective on-time need its own not to be skipped by (eg) image cleaning
     // Muons needs its own to have a unique SetReadyToSave
-    const TString rule(Form("s/([0-9]+_[0-9]+)_Y_(.*[.]root)$/%s\\/$1_I_$2/", Esc(fPathOut).Data()));
+    const TString rule(Form("s/([0-9]+(_M[12])?_[0-9.]+)_Y_(.*[.]root)$/%s\\/$1_I_$3/", Esc(fPathOut).Data()));
     MWriteRootFile write( 2, rule, fOverwrite?"RECREATE":"NEW");
     MWriteRootFile writet(2, rule, fOverwrite?"RECREATE":"NEW"); // EffectiveOnTime