|
[Rivet-svn] r2975 - in trunk: . doc src/Analyses src/Coreblackhole at projects.hepforge.org blackhole at projects.hepforge.orgFri Feb 25 22:44:19 GMT 2011
Author: buckley Date: Fri Feb 25 22:44:19 2011 New Revision: 2975 Log: Removing preliminary and unvalidated plugin libs in favour of analysis lib content specified with --enable-unvalidated, --disable-preliminary, and --disable-obsolete (the last of which takes its default value from --disable-preliminary). You'll need to clear out your analysis directory to avoid duplicates... but thanks to the new analysis loader, Rivet will tell you about that anyway :) Modified: trunk/ChangeLog trunk/configure.ac trunk/doc/rivet-manual.tex trunk/src/Analyses/Makefile.am trunk/src/Core/AnalysisLoader.cc Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Fri Feb 25 22:18:33 2011 (r2974) +++ trunk/ChangeLog Fri Feb 25 22:44:19 2011 (r2975) @@ -1,3 +1,14 @@ +2011-02-25 Andy Buckley <andy at insectnation.org> + + * Adding --disable-obsolete, which takes its value from the value + of --disable-preliminary by default. + + * Replacing RivetUnvalidated and RivetPreliminary plugin libraries + with optionally-configured analysis contents in the + experiment-specific plugin libraries. This avoids issues with + making libraries rebuild consistently when sources were reassigned + between libraries. + 2011-02-24 Andy Buckley <andy at insectnation.org> * Changing analysis plugin registration to fall back through Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Fri Feb 25 22:18:33 2011 (r2974) +++ trunk/configure.ac Fri Feb 25 22:44:19 2011 (r2975) @@ -155,7 +155,7 @@ AM_CONDITIONAL(ENABLE_ANALYSES, [test x$enable_analyses = xyes]) -## Disable build/install of unvalidated analyses +## Enable build/install of unvalidated analyses AC_ARG_ENABLE([unvalidated], [AC_HELP_STRING(--enable-unvalidated, [build and install unvalidated analyses])], [], [enable_unvalidated=no]) @@ -179,6 +179,18 @@ AM_CONDITIONAL(ENABLE_PRELIMINARY, [test x$enable_preliminary = xyes]) +## Disable build/install of now-obsolete preliminary analyses +AC_ARG_ENABLE([obsolete], + [AC_HELP_STRING(--disable-obsolete, [build and install now-obsolete analyses])], + [], [enable_obsolete=$enable_preliminary]) +if test x$enable_obsolete = xyes; then + AC_MSG_NOTICE([Building obsolete Rivet analyses]) +else + AC_MSG_NOTICE([Not building obsolete Rivet analyses, by request]) +fi +AM_CONDITIONAL(ENABLE_OBSOLETE, [test x$enable_obsolete = xyes]) + + ## Build LaTeX docs if possible... AC_PATH_PROG(PDFLATEX, pdflatex) AM_CONDITIONAL(WITH_PDFLATEX, [test x$PDFLATEX != x]) Modified: trunk/doc/rivet-manual.tex ============================================================================== --- trunk/doc/rivet-manual.tex Fri Feb 25 22:18:33 2011 (r2974) +++ trunk/doc/rivet-manual.tex Fri Feb 25 22:44:19 2011 (r2975) @@ -312,8 +312,8 @@ \subsection{Analysis status} -The standard Rivet analyses are divided into three classes: validated, -preliminary, and unvalidated (in decreasing order of academic +The standard Rivet analyses are divided into four status classes: validated, +preliminary, obsolete, and unvalidated (in roughly decreasing order of academic acceptability). The Rivet ``validation procedure'' is not (as of February 2011) formally @@ -335,14 +335,28 @@ library. While preliminary analyses may be used for physics studies, please be aware of the incomplete status of the corresponding experimental study, and also be aware that the histograms in such analyses may be renamed or removed -entirely, as may the analysis itself. Preliminary analyses will not have a -SPIRES preprint number, and hence on their move into the standard Rivet analysis -library they will normally undergo a name change: please ensure when you upgrade -between Rivet versions that any scripts or programs which were using preliminary -analyses are not broken by the disappearance or change of that analysis in the -newer version. The minor perils of using preliminary analyses can be avoided by -the cautious by building Rivet with the \kbd{-{}-disable-preliminary} -configuration flag, in which case their temptation will not even be offered. +entirely, as may the analysis itself. + +Preliminary analyses will not have a SPIRES preprint number, and hence on their +move into the standard Rivet analysis library they will normally undergo a name +change: please ensure when you upgrade between Rivet versions that any scripts +or programs which were using preliminary analyses are not broken by the +disappearance or change of that analysis in the newer version. The minor perils +of using preliminary analyses can be avoided by the cautious by building Rivet +with the \kbd{-{}-disable-preliminary} configuration flag, in which case their +temptation will not even be offered. + +To make transitions between Rivet versions more smooth and predictable for users +of preliminary analyses, preliminary analyses which are superseded by a +validated version will be reclassified as obsolete and will be retained for one +major version of Rivet with a status of "obsolete" before being removed, to give +users time to migrate their run scripts, i.e. if an analysis is marked as +obsolete in version 1.4.2, it will remain in Rivet's distribution until version +1.5.0. Obsolete analyses may have different reference histograms from the final +version and will not be maintained. Obsolete analyses will not be built if +either the \kbd{-{}-disable-obsolete} configuration flag is specified at build +time: for convenience, the default value of this flag is the value of the +\kbd{-{}-disable-preliminary} flag. Finally, unvalidated analyses are those whose implementation is incomplete, flawed or just troubled by doubts. Running such analyses is not a good idea if Modified: trunk/src/Analyses/Makefile.am ============================================================================== --- trunk/src/Analyses/Makefile.am Fri Feb 25 22:18:33 2011 (r2974) +++ trunk/src/Analyses/Makefile.am Fri Feb 25 22:44:19 2011 (r2975) @@ -3,62 +3,35 @@ LIBS = -lCDFConesPlugin -lSISConePlugin -lsiscone -lJadePlugin lib_LTLIBRARIES = - noinst_LTLIBRARIES = libRivetAnalysisTools.la libRivetAnalysisTools_la_SOURCES = \ MC_JetAnalysis.cc - +## ANALYSIS CATEGORIES +## ## Unvalidated analyses: add new standard analyses here, and only ## move them into the collider-specific standard plugin libraries ## once they have been finished and checked. The --enable-unvalidated -## flag is needed to install the RivetUnvalidated library. -if ENABLE_UNVALIDATED -lib_LTLIBRARIES += RivetUnvalidated.la -RivetUnvalidated_la_SOURCES = \ - ATLAS_2010_CONF_2010_049.cc \ - CDF_1991_S2313472.cc \ - CDF_1993_S2742446.cc \ - CDF_1996_S3108457.cc \ - CDF_1996_S3349578.cc \ - CDF_1997_S3541940.cc \ - CDF_2008_S7541902.cc \ - CDF_2008_S7782535.cc \ - D0_1996_S3214044.cc \ - D0_1996_S3324664.cc \ - D0_1998_S3711838.cc \ - DELPHI_2003_WUD_03_11.cc \ - E735_1998_S3905616.cc \ - H1_1995_S3167097.cc \ - MC_DIJET.cc \ - MC_PHOTONJETUE.cc \ - MC_TTBAR.cc \ - OPAL_1993_S2692198.cc \ - SFM_1984_S1178091.cc \ - STAR_2008_S7869363.cc \ - STAR_2008_S7993412.cc \ - LHCB_2010_S8758301.cc \ - ZEUS_2001_S4815815.cc -endif - - +## flag is needed to install the unvalidated analyses. +## ## Preliminary analyses: validated analyses whose experimental paper has not ## been fully accepted for publication should go here. Analyses in this group ## are considered safe to use but the reference data may yet change. In -## progressing from the preliminary analyses library to a permanent published -## analyses collection, the analysis name is likely to change, so you should -## ensure that any Rivet-using scripts are not broken by such name changes -## when upgrading between Rivet versions. These analyses will not be available -## if Rivet is built with the --disable-preliminary configure flag. -if ENABLE_PRELIMINARY -lib_LTLIBRARIES += RivetPreliminary.la -RivetPreliminary_la_SOURCES = \ - CDF_2008_LEADINGJETS.cc \ - CDF_2008_NOTE_9351.cc \ - CDF_2009_NOTE_9936.cc \ - DELPHI_2002_069_CONF_603.cc \ - STAR_2009_UE_HELEN.cc -endif +## progressing from preliminary status to a permanent published analyses +## collection, the analysis name is very likely to change, so you should ensure +## that any Rivet-using scripts are not broken by such name changes when +## upgrading between Rivet versions. These analyses will not be available if +## Rivet is built with the --disable-preliminary configure flag. +## +## Obsolete analyses: as mentioned above, when a preliminary analysis becomes +## permanent its name will change to reflect its newly published status via the +## publication's SPIRES ID. The previous form of the analysis, possibly with +## different reference histograms, will be retained for one major version of +## Rivet with a status of "obsolete" before being removed, to give users time to +## migrate their run scripts, i.e. if an analysis is marked as obsolete in +## version 1.4.2, it will remain in Rivet's distribution until version +## 1.5.0. Obsolete analyses will not be available if Rivet is built with the +## --disable-obsolete configure flag. lib_LTLIBRARIES += RivetALICEAnalyses.la @@ -78,6 +51,10 @@ ATLAS_2010_S8919674.cc \ ATLAS_2011_S8924791.cc \ ATLAS_2011_S8971293.cc +if ENABLE_UNVALIDATED +RivetATLASAnalyses_la_SOURCES += \ + ATLAS_2010_CONF_2010_049.cc +endif lib_LTLIBRARIES += RivetCMSAnalyses.la @@ -85,6 +62,14 @@ CMS_2011_S8957746.cc +lib_LTLIBRARIES += RivetLHCbAnalyses.la +RivetLHCbAnalyses_la_SOURCES = +if ENABLE_UNVALIDATED +RivetLHCbAnalyses_la_SOURCES += \ + LHCB_2010_S8758301.cc +endif + + lib_LTLIBRARIES += RivetCDFAnalyses.la RivetCDFAnalyses_la_SOURCES = \ CDF_1988_S1865951.cc \ @@ -113,6 +98,25 @@ CDF_2009_S8436959.cc \ CDF_2010_S8591881_DY.cc \ CDF_2010_S8591881_QCD.cc +if ENABLE_PRELIMINARY +RivetCDFAnalyses_la_SOURCES += \ + CDF_2009_NOTE_9936.cc +endif +if ENABLE_OBSOLETE +RivetCDFAnalyses_la_SOURCES += \ + CDF_2008_LEADINGJETS.cc \ + CDF_2008_NOTE_9351.cc +endif +if ENABLE_UNVALIDATED +RivetCDFAnalyses_la_SOURCES += \ + CDF_1991_S2313472.cc \ + CDF_1993_S2742446.cc \ + CDF_1996_S3108457.cc \ + CDF_1996_S3349578.cc \ + CDF_1997_S3541940.cc \ + CDF_2008_S7541902.cc \ + CDF_2008_S7782535.cc +endif lib_LTLIBRARIES += RivetD0Analyses.la @@ -135,12 +139,23 @@ D0_2010_S8570965.cc \ D0_2010_S8671338.cc \ D0_2010_S8821313.cc +if ENABLE_UNVALIDATED +RivetD0Analyses_la_SOURCES += \ + D0_1996_S3214044.cc \ + D0_1996_S3324664.cc \ + D0_1998_S3711838.cc +endif lib_LTLIBRARIES += RivetHERAAnalyses.la RivetHERAAnalyses_la_SOURCES = \ H1_1994_S2919893.cc \ H1_2000_S4129130.cc +if ENABLE_UNVALIDATED +RivetHERAAnalyses_la_SOURCES += \ + H1_1995_S3167097.cc \ + ZEUS_2001_S4815815.cc +endif lib_LTLIBRARIES += RivetLEPAnalyses.la @@ -154,6 +169,15 @@ OPAL_1998_S3780481.cc \ OPAL_2001_S4553896.cc \ OPAL_2004_S6132243.cc +if ENABLE_PRELIMINARY +RivetLEPAnalyses_la_SOURCES += \ + DELPHI_2002_069_CONF_603.cc +endif +if ENABLE_UNVALIDATED +RivetLEPAnalyses_la_SOURCES += \ + DELPHI_2003_WUD_03_11.cc \ + OPAL_1993_S2692198.cc +endif lib_LTLIBRARIES += RivetRHICAnalyses.la @@ -161,6 +185,15 @@ STAR_2006_S6500200.cc \ STAR_2006_S6860818.cc \ STAR_2006_S6870392.cc +if ENABLE_PRELIMINARY +RivetRHICAnalyses_la_SOURCES += \ + STAR_2009_UE_HELEN.cc +endif +if ENABLE_UNVALIDATED +RivetRHICAnalyses_la_SOURCES += \ + STAR_2008_S7869363.cc \ + STAR_2008_S7993412.cc +endif lib_LTLIBRARIES += RivetSPSAnalyses.la @@ -179,6 +212,11 @@ PDG_Hadron_Multiplicities_Ratios.cc \ JADE_OPAL_2000_S4300807.cc \ BELLE_2006_S6265367.cc +if ENABLE_UNVALIDATED +RivetMiscAnalyses_la_SOURCES += \ + E735_1998_S3905616.cc \ + SFM_1984_S1178091.cc +endif lib_LTLIBRARIES += RivetMCAnalyses.la @@ -195,3 +233,9 @@ MC_LEADINGJETS.cc \ MC_DIPHOTON.cc \ MC_SUSY.cc +if ENABLE_UNVALIDATED +RivetMCAnalyses_la_SOURCES += \ + MC_DIJET.cc \ + MC_PHOTONJETUE.cc \ + MC_TTBAR.cc +endif Modified: trunk/src/Core/AnalysisLoader.cc ============================================================================== --- trunk/src/Core/AnalysisLoader.cc Fri Feb 25 22:18:33 2011 (r2974) +++ trunk/src/Core/AnalysisLoader.cc Fri Feb 25 22:44:19 2011 (r2975) @@ -60,7 +60,7 @@ const string name = ab->name(); if (_ptrs.find(name) != _ptrs.end()) { // Duplicate analyses will be ignored... loudly - cerr << "Ignoring duplicate plugin analysis called '" << name << "'" << endl; + //cerr << "Ignoring duplicate plugin analysis called '" << name << "'" << endl; MSG_WARNING("Ignoring duplicate plugin analysis called '" << name << "'"); } else { MSG_TRACE("Registering a plugin analysis called '" << name << "'");
More information about the Rivet-svn mailing list |