Changeset 8389

Timestamp:

04/03/07 15:37:57 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/03 Thomas Bretz
+
+   * mjobs/MDataSet.cc:
+     - added processing of RunTime and Name resource
+
+
+
  2007/03/29 Thomas Bretz
 

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -194 +194 @@
 MDataSet::MDataSet(const char *fname, TString sequences, TString data)
 {
-    fName  = fname;
+    fName = fname;
 
     fSequencesOn.SetOwner();
     fSequencesOff.SetOwner();
 
-    const char *expname = gSystem->ExpandPathName(fname);
-
-    fTitle = Form("Dataset contained in file %s", expname);
+    TString expname(fname);
+    gSystem->ExpandPathName(expname);
 
     const Bool_t access = !gSystem->AccessPathName(expname, kFileExists);
@@ -208 +207 @@
 
     MEnv env(expname);
-    delete [] expname;
-
-    fNumAnalysis = env.GetValue("AnalysisNumber",  -1);
+
+    fNumAnalysis = env.GetValue("AnalysisNumber", -1);
+    fTitle       = env.GetValue("Name", expname);
 
     TString str;
@@ -235 +234 @@
     fCatalog    = fCatalog.Strip(TString::kBoth);
 
+    // --- Now "touch" resources which are not yet stored in MDataSet ---
+    env.Touch("RunTime");
+
+    // --- Print "untouch" resources ---
     if (env.GetNumUntouched()>0)
     {
@@ -268 +271 @@
     }
     gLog << "AnalysisNumber: " << fNumAnalysis << endl << endl;
+
+    if (!fTitle.IsNull())
+        gLog << "Name: " << fTitle << endl << endl;
+
     gLog << "SequencesOn:   ";
     for (int i=0; i<fNumSequencesOn.GetSize(); i++)
@@ -282 +289 @@
     gLog << "WobbleMode: " << (fIsWobbleMode?"On":"Off") << endl << endl;
 
+
+
     gLog << "Comment: " << fComment << endl;