[Rivet] [Rivet-svn] r2957 - trunk/src/Core

[Frank Siegert]

Hi Andy,

> Log:
> Upgrade unvalidated warning and add new preliminary status warning, plus using the newly-available MSG_* macros
>
> Modified:
>     trunk/src/Core/AnalysisHandler.cc
>
> Modified: trunk/src/Core/AnalysisHandler.cc
> ==============================================================================
> --- trunk/src/Core/AnalysisHandler.cc	Tue Feb 22 23:42:11 2011	(r2956)
> +++ trunk/src/Core/AnalysisHandler.cc	Tue Feb 22 23:43:11 2011	(r2957)
> @@ -68,9 +68,10 @@
>       const size_t num_anas_requested = analysisNames().size();
>       removeIncompatibleAnalyses(beamIds());
>       foreach (const AnaHandle a, analyses()) {
> -      if (toUpper(a->status()) != "VALIDATED") {
> -        getLog()<<  Log::WARN
> -<<  "Analysis '"<<  a->name()<<  "' is unvalidated: be careful!"<<  endl;
> +      if (toUpper(a->status()) != "PRELIMINARY") {
> +        MSG_WARNING("Analysis '"<<  a->name()<<  "' is preliminary: be careful, it may change and/or be renamed!");

Do I misunderstand this part of the code, or is this the wrong way around?

Cheers,
Frank

> +      } else if (toUpper(a->status()) != "VALIDATED") {
> +        MSG_WARNING("Analysis '"<<  a->name()<<  "' is unvalidated: be careful, it may be broken!");
>         }
>       }
>       if (num_anas_requested>  0&&  analysisNames().size() == 0) {