Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8244) +++ /trunk/MagicSoft/Mars/Changelog (revision 8245) @@ -68,4 +68,17 @@ - use return value of MDataSet::AddFilesOn/Off for a sanity check + * mjobs/MJob.[h,cc]: + - removed obsolete fPathData and stuff + + * callisto.cc, star.cc: + - removed obsolete calls to MJob::SetPathData + + * callisto.rc, star.rc: + - removed obsolete examples for "PathData"-resource + + * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc, + mjobs/MJCalibration.cc, mjobs/MJPedestal.cc, mjobs/MJStar.cc: + - removed obsolete reference to fPathData + Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 8244) +++ /trunk/MagicSoft/Mars/NEWS (revision 8245) @@ -38,4 +38,7 @@ treatment is not done for it anymore because it has never been used. + - callisto: Fixed a bug in the seuqence handling which caused the + light condition to be ignored + - optim: fixed a problem with the optim-macros which was due to a bug in the new phrase parsing @@ -51,4 +54,8 @@ macros could run with less files found than expected from the sequence-files. No the execution is stopped in this case. + + - ganymed: now stores the dataset in the output file with all information + contained (as sequence number, sequence path, data path) so that the + used dataset file can be recreated complete from the output - sponde: now also allows the uasge of random forest Index: /trunk/MagicSoft/Mars/callisto.cc =================================================================== --- /trunk/MagicSoft/Mars/callisto.cc (revision 8244) +++ /trunk/MagicSoft/Mars/callisto.cc (revision 8245) @@ -283,5 +283,5 @@ // Setup sequence and check its validity // - MSequence seq(kSequence); + MSequence seq(kSequence, kInpathD); if (kPrintSeq) { @@ -372,5 +372,4 @@ job1.SetDisplay(d); job1.SetOverwrite(kOverwrite); - job1.SetPathData(kInpathD); job1.SetDataType(kDataType); job1.SetUseHists(kMoon); @@ -403,5 +402,4 @@ job2.SetDisplay(d);; job2.SetOverwrite(kOverwrite); - job2.SetPathData(kInpathD); job2.SetDataType(kDataType); job2.SetUseHists(kMoon); @@ -440,5 +438,4 @@ job3.SetOverwrite(kOverwrite); job3.SetPathOut(kOutpathC); - job3.SetPathData(kInpathD); job3.SetDataType(kDataType); // job2.SetPathIn(kInpathC); // not yet needed @@ -473,5 +470,4 @@ job4.SetOverwrite(kOverwrite); job4.SetPathOut(kOutpathC); - job4.SetPathData(kInpathD); job4.SetDataType(kDataType); @@ -508,5 +504,4 @@ job1.SetNoDisplay(); job1.SetOverwrite(kOverwrite); - job1.SetPathData(kInpathD); job1.SetPathIn(kInpathY); // --> READ Extractor from calib-file job1.SetDataType(kDataType); @@ -539,5 +534,4 @@ job2.SetNoDisplay(); job2.SetOverwrite(kOverwrite); - job2.SetPathData(kInpathD); job2.SetPathIn(kInpathY); job2.SetDataType(kDataType); @@ -596,5 +590,4 @@ job3.SetNoDisplay(); job3.SetOverwrite(kOverwrite); - job3.SetPathData(kInpathD); job3.SetPathIn(kInpathY); job3.SetDataType(kDataType); @@ -632,5 +625,4 @@ job4.SetPathIn(kInpathY); job4.SetPathOut(kOutpathY); - job4.SetPathData(kInpathD); job4.SetDataType(kDataType); if (kDataType!=MJCalib::kIsUseMC) Index: /trunk/MagicSoft/Mars/callisto.rc =================================================================== --- /trunk/MagicSoft/Mars/callisto.rc (revision 8244) +++ /trunk/MagicSoft/Mars/callisto.rc (revision 8245) @@ -42,14 +42,4 @@ # ------------------------------------------------------------------------- #MJCalibration.PathOut: calped - -# ------------------------------------------------------------------------- -# Use this to define where the program should search for the pedestal -# and calibration files defined in the sequence. To use the local -# directory use '.' If nothing is specified the default path in the -# datacenter is used. (overwrites command line options) -# ------------------------------------------------------------------------- -#MJPedestalC1.PathData: /data/MAGIC/Period016/ -#MJPedestalC2.PathData: /data/MAGIC/Period016/ -#MJCalibration.PathData: /data/MAGIC/Period016/ # ------------------------------------------------------------------------- @@ -288,8 +278,4 @@ #MJPedestalY2.PathOut: . #MJPedestalY3.PathOut: . -#MJPedestalY1.PathData: /data/MAGIC/Period016/ -#MJPedestalY2.PathData: /data/MAGIC/Period016/ -#MJPedestalY3.PathData: /data/MAGIC/Period016/ -#MJCalibrateSignal.PathData: /data/MAGIC/Period016/ #MJCalibrateSignal.PathIn: . Index: /trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (revision 8245) @@ -287,5 +287,5 @@ if (fSequence.IsValid()) { - if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0) + if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0) return kFALSE; } Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8245) @@ -246,5 +246,5 @@ if (fSequence.IsValid()) { - if (fSequence.SetupDatRuns(iter, fPathData, IsUseRawData())<=0) + if (fSequence.SetupDatRuns(iter, 0, IsUseRawData())<=0) return kFALSE; } Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8245) @@ -1698,5 +1698,5 @@ MDirIter iter; - if (fSequence.SetupCalRuns(iter, fPathData, IsUseRawData())<=0) + if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0) return kFALSE; Index: /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 8245) @@ -1003,5 +1003,5 @@ fLog->Separator(GetDescriptor()); *fLog << "Calculate MPedestalCam from " << type << "-runs "; - *fLog << fSequence.GetName() << endl; + *fLog << fSequence.GetFileName() << endl; *fLog << endl; @@ -1023,6 +1023,6 @@ { const Int_t n0 = IsUseData() - ? fSequence.SetupDatRuns(iter, fPathData, IsUseRawData()) - : fSequence.SetupPedRuns(iter, fPathData, IsUseRawData()); + ? fSequence.SetupDatRuns(iter, 0, IsUseRawData()) + : fSequence.SetupPedRuns(iter, 0, IsUseRawData()); if (n0<=0) Index: /trunk/MagicSoft/Mars/mjobs/MJStar.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJStar.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJStar.cc (revision 8245) @@ -142,5 +142,5 @@ MDirIter iter; - if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated, fPathData)<=0) + if (fSequence.SetupDatRuns(iter, MSequence::kCalibrated)<=0) return kFALSE; Index: /trunk/MagicSoft/Mars/mjobs/MJob.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJob.cc (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJob.cc (revision 8245) @@ -140,10 +140,4 @@ } -void MJob::SetPathData(const char *path) -{ - fPathData = path; - FixPath(fPathData); -} - const TEnv *MJob::GetEnv() const { @@ -184,8 +178,4 @@ if (!p.IsNull()) SetPathIn(p); - - p = GetEnv("PathData", ""); - if (!p.IsNull()) - SetPathData(p); SetMaxEvents(GetEnv("MaxEvents", fMaxEvents)); Index: /trunk/MagicSoft/Mars/mjobs/MJob.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJob.h (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MJob.h (revision 8245) @@ -24,5 +24,4 @@ TString fPathOut; // Directory to write output file to (eg. calib*.root) TString fPathIn; // Directory to read output from (eg. calib*.root) - TString fPathData; // Directory to read data files from (2004*.root) Bool_t fOverwrite; // Allow overwriting output files @@ -58,5 +57,4 @@ void SetPathOut(const char *path="."); void SetPathIn(const char *path="."); - void SetPathData(const char *path="."); void SetOverwrite(Bool_t b=kTRUE) { fOverwrite=b; } @@ -71,5 +69,4 @@ TString GetPathOut() const { return fPathOut; } TString GetPathIn() const { return fPathIn; } - TString GetPathData() const { return fPathData; } // Others Index: /trunk/MagicSoft/Mars/mjobs/MSequence.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 8244) +++ /trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 8245) @@ -26,4 +26,7 @@ }; private: + TString fFileName; + TString fDataPath; + UInt_t fSequence; @@ -63,5 +66,5 @@ MSequence() : fSequence((UInt_t)-1), fLastRun((UInt_t)-1), fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1) { } - MSequence(const char *fname); + MSequence(const char *fname, const char *path=""); MSequence(const MSequence &s) : fSequence(s.fSequence), fStart(s.fStart), fLastRun(s.fLastRun), fNumEvents(s.fNumEvents), fPeriod(s.fPeriod), @@ -114,4 +117,7 @@ const TString GetStandardPath() const { return "/magic/data/"; } + const TString &GetFileName() const { return fFileName; } + const TString &GetDataPath() const { return fDataPath; } + // Setter void SetNight(const char*night); Index: /trunk/MagicSoft/Mars/star.cc =================================================================== --- /trunk/MagicSoft/Mars/star.cc (revision 8244) +++ /trunk/MagicSoft/Mars/star.cc (revision 8245) @@ -179,5 +179,5 @@ // Setup sequence and check its validity // - MSequence seq(kSequence); + MSequence seq(kSequence, kInpath); if (kPrintSeq) { @@ -244,5 +244,4 @@ job.SetOverwrite(kOverwrite); job.SetPathOut(kOutpath); - job.SetPathData(kInpath); // job.SetPathIn(kInpath); // not yet needed if (kNoMuons) Index: /trunk/MagicSoft/Mars/star.rc =================================================================== --- /trunk/MagicSoft/Mars/star.rc (revision 8244) +++ /trunk/MagicSoft/Mars/star.rc (revision 8245) @@ -29,12 +29,4 @@ #MJStar.PathOut: . #MJStar.PathIn: . - -# ------------------------------------------------------------------------- -# Use this to define where the program should search for the pedestal -# and calibration files defined in the sequence. To use the local -# directory use '.' If nothing is specified the default path in the -# datacenter is used. (overwrites command line options) -# ------------------------------------------------------------------------- -#MJStar.PathData: /data/MAGIC/Period016/ # -------------------------------------------------------------------------