Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8441) +++ trunk/MagicSoft/Mars/Changelog (revision 8442) @@ -19,4 +19,42 @@ -*-*- END OF LINE -*-*- + 2007/04/24 Thomas Bretz + + * callisto_Dec04Jan05.rc, callisto_MarApr05.rc, callisto_mux.rc: + - fixed typos in examples for movie encoding + + * mjobs/MJCalib.h, mjobs/MJPedestal.cc: + - missing commit from yesterday :-( + + * mmovie/MMovieWrite.cc: + - changed resource Filename according to the other resources + to FileName + + * ganymed.cc: + - enable dataset mc-mode if "-mc" is specified + - removed obsolete call to EnableMonteCarloMode + - removed EnableWobbleMode but use the setting of the dataset + instead + + * mjobs/MDataSet.[h,cc]: + - renamed fIsWobbleMode to fWobbleMode + - added setter for fWobbleMode + - added fMonteCarlo which determins the default paths to be used + if not overwritten + - replaced the static variables for the paths by member functions + which depend on the new fWobbleMode data member + - some simple reordering inthe constructor was necessary + - increased class version number accordingly to 2 + + * mjobs/MJCut.[h,cc]: + - repaired On-only mode + - removed data member fIsMonteCarlo, use the data-set getter instead + - removed data member fIsWobbleMode, use the data-set getter instead + + * sponde.cc: + - print a warning if MC dataset doens't contain "MonteCarlo: Yes" + + + 2007/04/23 Thomas Bretz Index: trunk/MagicSoft/Mars/NEWS =================================================================== --- trunk/MagicSoft/Mars/NEWS (revision 8441) +++ trunk/MagicSoft/Mars/NEWS (revision 8442) @@ -56,4 +56,12 @@ helps to get rid of artefacts in histograms. For the signal this is not necessray because it is displayed in log-scale anyhow + + - ganymed: If the dataset file containes "MonteCarlo: Yes" the "-mc" + option can now be omitted. + + - ganymed: If either the dataset file containes "MonteCarlo: Yes" + or the option "-mc" is specified as default the monte carlo datacenter + paths (/magic/montecarlo/...) are used if not overwritten in the + dataset file. - ganymed: The output files now contain run- and event-number for all Index: trunk/MagicSoft/Mars/ganymed.cc =================================================================== --- trunk/MagicSoft/Mars/ganymed.cc (revision 8441) +++ trunk/MagicSoft/Mars/ganymed.cc (revision 8442) @@ -203,4 +203,6 @@ if (!seq.IsMonteCarlo()) seq.SetMonteCarlo(kIsMc); + if (kWobbleModeOn || kWobbleModeOff) + seq.SetWobbleMode(kWobbleModeOn); if (kNumAnalysis>=0) seq.SetNumAnalysis(kNumAnalysis); @@ -230,10 +232,4 @@ return 1; } - - Bool_t iswobble = seq.IsWobbleMode(); - if (kWobbleModeOn) - iswobble = kTRUE; - if (kWobbleModeOff) - iswobble = kFALSE; // @@ -266,5 +262,4 @@ //job.SetNameResultFile(kNameResult); job.EnableWriteOnly(kWriteOnly); - job.EnableWobbleMode(iswobble); //if (kFullDisplay) // job.EnableFullDisplay(kFullDisplay); Index: trunk/MagicSoft/Mars/mjobs/MDataSet.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MDataSet.h (revision 8441) +++ trunk/MagicSoft/Mars/mjobs/MDataSet.h (revision 8442) @@ -120,4 +120,5 @@ // Setter void SetMonteCarlo(Bool_t ismc=kTRUE) { fMonteCarlo=ismc; } + void SetWobbleMode(Bool_t wobm=kTRUE) { fWobbleMode=wobm; } static Bool_t AddSequencesFromList(const TList &list, MDirIter &files); Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 8441) +++ trunk/MagicSoft/Mars/mjobs/MJCut.cc (revision 8442) @@ -18,5 +18,5 @@ ! Author(s): Thomas Bretz, 1/2005 ! -! Copyright: MAGIC Software Development, 2000-2005 +! Copyright: MAGIC Software Development, 2000-2007 ! ! @@ -26,6 +26,4 @@ // // MJCut -// -// FIXME: Preparation for wobble mode missing // ///////////////////////////////////////////////////////////////////////////// @@ -86,10 +84,10 @@ // // Default constructor. Set defaults for fStoreSummary, fStoreresult, -// fWriteOnly, fIsWobble and fFullDisplay to kFALSE and initialize +// fWriteOnly, fFullDisplay to kFALSE and initialize // /*fEstimateEnergy and*/ fCalcHadronness with NULL. // MJCut::MJCut(const char *name, const char *title) : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE), - fIsWobble(kFALSE), fFullDisplay(kTRUE), + fFullDisplay(kTRUE), fRndmSrcPos(kFALSE), fNameHist("MHThetaSq"), fCalcHadronness(0), fCalcDisp(0) { @@ -330,5 +328,4 @@ EnableStorageOfSummary(GetEnv("SummaryFile", fStoreSummary)); EnableStorageOfResult(GetEnv("ResultFile", fStoreResult)); - EnableWobbleMode(GetEnv("WobbleMode", fIsWobble)); EnableFullDisplay(GetEnv("FullDisplay", fFullDisplay)); EnableRandomSrcPos(GetEnv("RandomSourcePosition", fRndmSrcPos)); @@ -551,6 +548,6 @@ MParList plist; - MHSrcPosCam hsrcpos(fIsWobble); - if (!fIsWobble && source.IsInitialized() && fRndmSrcPos) + MHSrcPosCam hsrcpos(set.IsWobbleMode()); + if (!set.IsWobbleMode() && source.IsInitialized() && fRndmSrcPos) { if (!FillSrcPosCam(set, source, hsrcpos)) @@ -614,5 +611,5 @@ MAlphaFitter fit; plist.AddToList(&fit); - if (fIsWobble) + if (set.IsWobbleMode()) fit.SetScaleMode(MAlphaFitter::kNone); @@ -643,8 +640,8 @@ MRead &readoff = set.IsMonteCarlo() ? (MRead&)readoffmc : (MRead&)readoffdata; - const Bool_t setrc = fIsWobble ? set.AddFilesOn(readoff) : set.AddFilesOff(readoff); + const Bool_t setrc = set.IsWobbleMode() ? set.AddFilesOn(readoff) : set.AddFilesOff(readoff); if (!setrc && set.HasOffSequences()) { - *fLog << err << "MDataSet::AddFiles" << (fIsWobble?"On":"Off") << " failed." << endl; + *fLog << err << "MDataSet::AddFiles" << (set.IsWobbleMode()?"On":"Off") << " failed." << endl; return kFALSE; } @@ -699,5 +696,5 @@ // How to get source position from off- and on-data? MSrcPosCalc scalc; - scalc.SetMode(fIsWobble?MSrcPosCalc::kWobble:MSrcPosCalc::kOffData); /********************/ + scalc.SetMode(set.IsWobbleMode()?MSrcPosCalc::kWobble:MSrcPosCalc::kOffData); /********************/ MSrcPosCorrect scor; @@ -716,8 +713,8 @@ tlist2.AddToList(&scor); tlist2.AddToList(&srcrndm); - //if (fRndmSrcPos && !fIsWobble) + //if (fRndmSrcPos && !set.IsWobbleMode()) // tlist2.AddToList(&fill0a); tlist2.AddToList(&hcalc); - if (fIsWobble) + if (set.IsWobbleMode()) tlist2.AddToList(&hcalc2); //tlist2.AddToList(&taskenv1); @@ -732,5 +729,5 @@ tlist2.AddToList(&fill1a); tlist2.AddToList(&cont1); - if (!fWriteOnly && (!fIsWobble || !fNameHistFS.IsNull())) + if (!fWriteOnly && (!set.IsWobbleMode() || !fNameHistFS.IsNull())) tlist2.AddToList(&ffs); tlist2.AddToList(&cont2); @@ -796,5 +793,5 @@ return kFALSE; - if (set.HasOffSequences() || fIsWobble) + if (set.HasOffSequences() || set.IsWobbleMode()) { // Execute first analysis @@ -852,11 +849,11 @@ fill7b.SetNameTab("NewPar"); //fill9b.SetNameTab("EffOnT"); - fill1b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill2b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill3b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill4b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill5b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill6b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); - fill7b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); + fill1b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill2b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill3b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill4b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill5b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill6b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); + fill7b.SetDrawOption(set.HasOffSequences()||set.IsWobbleMode()?"same":""); //fill9b.SetFilter(&fbin); @@ -903,5 +900,5 @@ tlist.Replace(&readon); - if (fRndmSrcPos && !fIsWobble) + if (fRndmSrcPos && !set.IsWobbleMode()) { // tlist2.RemoveFromList(&fill0a); @@ -911,5 +908,5 @@ MFillH fillsrc(&hsrcpos, "MSrcPosCam", "FillSrcPosCam"); fillsrc.SetNameTab("SrcPos"); - if (fIsWobble) + if (set.IsWobbleMode()) tlist2.AddToListBefore(&fillsrc, &hcalc); @@ -936,7 +933,7 @@ //if (!fIsMonteCarlo) // tlist2.Replace(&fill9b); - if (!fIsWobble || !fNameHist.IsNull()) + if (!set.IsWobbleMode() || !fNameHist.IsNull()) tlist2.Replace(&ffs2); - if (fIsWobble) + if (set.IsWobbleMode()) { tlist2.AddToListAfter(&fillphi, &falpha2); Index: trunk/MagicSoft/Mars/mjobs/MJCut.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCut.h (revision 8441) +++ trunk/MagicSoft/Mars/mjobs/MJCut.h (revision 8442) @@ -21,5 +21,4 @@ Bool_t fStoreResult; Bool_t fWriteOnly; - Bool_t fIsWobble; Bool_t fFullDisplay; Bool_t fRndmSrcPos; @@ -59,5 +58,4 @@ void EnableStorageOfResult(Bool_t b=kTRUE) { fStoreResult = b; } // See SetNameResult void EnableWriteOnly(Bool_t b=kTRUE) { fWriteOnly = b; } - void EnableWobbleMode(Bool_t b=kTRUE) { fIsWobble = b; } void EnableFullDisplay(Bool_t b=kTRUE) { fFullDisplay = b; } void EnableRandomSrcPos(Bool_t b=kTRUE) { fRndmSrcPos = b; } Index: trunk/MagicSoft/Mars/sponde.cc =================================================================== --- trunk/MagicSoft/Mars/sponde.cc (revision 8441) +++ trunk/MagicSoft/Mars/sponde.cc (revision 8442) @@ -175,7 +175,11 @@ if (!seq.IsValid()) { - gLog << err << "Sequences read but not valid!" << endl << endl; - return 2; - } + gLog << err << "Dataset read but not valid (maybe analysis number not set)!" << endl << endl; + return 2; + } + + if (!seq.IsMonteCarlo()) + gLog << warn << "Dataset file seems not to be a Monte Carlo dataset." << endl << endl; + //