|
[Rivet-svn] r3420 - in branches/2011-07-aida2yoda: . bin data/anainfo data/plotinfo doc pyext src/Analyses src/Coreblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Oct 6 21:57:08 BST 2011
Author: hoeth Date: Thu Oct 6 21:57:04 2011 New Revision: 3420 Log: merge r3366-3375 from trunk Modified: branches/2011-07-aida2yoda/ChangeLog branches/2011-07-aida2yoda/bin/make-plots branches/2011-07-aida2yoda/bin/rivet branches/2011-07-aida2yoda/bin/rivet-mergeruns branches/2011-07-aida2yoda/bin/rivet-mkanalysis branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_CONF_2010_049.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8817804.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8914702.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8919674.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9120807.info branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9128077.info branches/2011-07-aida2yoda/data/anainfo/CDF_1988_S1865951.info branches/2011-07-aida2yoda/data/anainfo/CDF_1996_S3108457.info branches/2011-07-aida2yoda/data/anainfo/CDF_1998_S3618439.info branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4155203.info branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4266730.info branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4517016.info branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4563131.info branches/2011-07-aida2yoda/data/anainfo/CDF_2005_S6080774.info branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6450792.info branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6653332.info branches/2011-07-aida2yoda/data/anainfo/CDF_2007_S7057202.info branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7540469.info branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7541902.info branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7828950.info branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S8093652.info branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8233977.info branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8383952.info branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8436959.info branches/2011-07-aida2yoda/data/anainfo/D0_2000_S4480767.info branches/2011-07-aida2yoda/data/anainfo/D0_2001_S4674421.info branches/2011-07-aida2yoda/data/anainfo/D0_2006_S6438750.info branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7662670.info branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7719523.info branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7863608.info branches/2011-07-aida2yoda/data/anainfo/D0_2009_S8349509.info branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8566488.info branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8570965.info branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8671338.info branches/2011-07-aida2yoda/data/anainfo/MC_DIPHOTON.info branches/2011-07-aida2yoda/data/anainfo/MC_HJETS.info branches/2011-07-aida2yoda/data/anainfo/MC_JETS.info branches/2011-07-aida2yoda/data/anainfo/MC_PHOTONJETS.info branches/2011-07-aida2yoda/data/anainfo/MC_VH2BB.info branches/2011-07-aida2yoda/data/anainfo/MC_WJETS.info branches/2011-07-aida2yoda/data/anainfo/MC_WPOL.info branches/2011-07-aida2yoda/data/anainfo/MC_WWJETS.info branches/2011-07-aida2yoda/data/anainfo/MC_XS.info branches/2011-07-aida2yoda/data/anainfo/MC_ZJETS.info branches/2011-07-aida2yoda/data/anainfo/MC_ZZJETS.info branches/2011-07-aida2yoda/data/anainfo/STAR_2006_S6870392.info branches/2011-07-aida2yoda/data/anainfo/UA1_1990_S2044935.info branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_S8924791.plot branches/2011-07-aida2yoda/doc/make-plots.txt branches/2011-07-aida2yoda/doc/mk-analysis-html branches/2011-07-aida2yoda/doc/mk-analysis-latex branches/2011-07-aida2yoda/pyext/spiresbib.py branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I919017.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9041966.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9126244.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9128077.cc branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8884919.cc branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_JETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_VH2BB.cc branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc branches/2011-07-aida2yoda/src/Core/AnalysisInfo.cc Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/ChangeLog Thu Oct 6 21:57:04 2011 (r3420) @@ -1,11 +1,31 @@ +2011-09-19 Hendrik Hoeth <hendrik.hoeth at cern.ch> + + * make-plots: Fixing regex for \physicscoor. Adding "FrameColor" + option. + 2011-09-17 Andy Buckley <andy at insectnation.org> + * Improving interactive metadata printout, by not printing + headings for missing info. + + * Bumping the release number to 1.7.0alpha0, since with these + SPIRES/Inspire changes and the MissingMomentum API change we need + more than a minor release. + + * Updating the mkanalysis, BibTeX-grabbing and other places that + care about analysis SPIRES IDs to also be able to handle the new + Inspire system record IDs. The missing link is getting to HepData + from an Inspire code... + + * Using the .info file rather than an in-code declaration to + specify that an analysis needs cross-section information. + * Adding Inspire support to the AnalysisInfo and Analysis interfaces. Maybe we can find a way to combine the two, e.g. return the SPIRES code prefixed with an "S" if no Inspire ID is available... -2011-09-18 Hendrik Hoeth <hendrik.hoeth at cern.ch> +2011-09-17 Hendrik Hoeth <hendrik.hoeth at cern.ch> * Added ALICE_2011_S8909580 (strange particle production at 900 GeV) Modified: branches/2011-07-aida2yoda/bin/make-plots ============================================================================== --- branches/2011-07-aida2yoda/bin/make-plots Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/bin/make-plots Thu Oct 6 21:57:04 2011 (r3420) @@ -596,7 +596,7 @@ inputdata.description.setdefault('GofLegend','0') inputdata.description.setdefault('GofFrame','') - inputdata.description['DrawGofFrame']=None + inputdata.description.setdefault('FrameColor',None) for i in inputdata.description['DrawOnly']: if i==refdata: continue @@ -605,8 +605,8 @@ if inputdata.description.has_key('GofType') and inputdata.description['GofType']!='chi2': return gof = inputdata.histos[i].getChi2(inputdata.histos[refdata]) - if i==inputdata.description['GofFrame']: - inputdata.description['DrawGofFrame']=pickcolor(gof) + if i==inputdata.description['GofFrame'] and inputdata.description['FrameColor']==None: + inputdata.description['FrameColor']=pickcolor(gof) if inputdata.histos[i].description.setdefault('Title', '')!='': inputdata.histos[i].description['Title'] += ', ' inputdata.histos[i].description['Title'] += '$\\chi^2/n={}$%1.2f' %gof @@ -962,7 +962,7 @@ out = "" out += ('\n%\n% Special\n%\n') import re - regex = re.compile(r'^(.*?)(\\physics[xy]?coor)\(([^,]+),([^,]+)\)(.*)') + regex = re.compile(r'^(.*?)(\\physics[xy]?coor)\(([0-9\.\s]+),([0-9\.\s]+)\)(.*)') for i in range(len(self.data)): while regex.search(self.data[i]): match = regex.search(self.data[i]) @@ -1600,10 +1600,10 @@ def draw(self,inputdata): out = ('\n%\n% Frame\n%\n') - if inputdata.description.has_key('DrawGofFrame') and inputdata.description['DrawGofFrame']!=None: - color = inputdata.description['DrawGofFrame'] + if inputdata.description.has_key('FrameColor') and inputdata.description['FrameColor']!=None: + color = inputdata.description['FrameColor'] # We want to draw this frame only once, so set it to False for next time: - inputdata.description['DrawGofFrame']=None + inputdata.description['FrameColor']=None # Calculate how high and wide the overall plot is height = [0,0] Modified: branches/2011-07-aida2yoda/bin/rivet ============================================================================== --- branches/2011-07-aida2yoda/bin/rivet Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/bin/rivet Thu Oct 6 21:57:04 2011 (r3420) @@ -277,22 +277,36 @@ print "" print "Status: %s" % ana.status() print "" - print "Spires ID: %s" % ana.spiresId() - print "Inspire URL: http://inspire-hep.net/search?p=find+key+%s" % ana.spiresId() - print "HepData URL: http://hepdata.cedar.ac.uk/view/irn%s" % ana.spiresId() - coll = "" - if ana.collider(): - coll = ana.collider() - print "Experiment: %s" % ana.experiment(), "(%s)" % coll - print "Year of publication: %s" % ana.year() + + if ana.inspireId(): + print "Inspire ID: %s" % ana.inspireId() + print "Inspire URL: http://inspire-hep.net/record/%s" % ana.inspireId() + # TODO: Need a way to get to HepData from an Inspire record + elif ana.spiresId(): + print "Spires ID: %s" % ana.spiresId() + print "Inspire URL: http://inspire-hep.net/search?p=find+key+%s" % ana.spiresId() + print "HepData URL: http://hepdata.cedar.ac.uk/view/irn%s" % ana.spiresId() + + if ana.experiment(): + print "Experiment: %s" % ana.experiment(), + if ana.collider(): + print "(%s)" % ana.collider() + + if ana.year(): + print "Year of publication: %s" % ana.year() + print "Authors:" for a in ana.authors(): print " " + a + print "" + print "Description:" twrap = textwrap.TextWrapper(width=75, initial_indent=2*" ", subsequent_indent=2*" ") print twrap.fill(ana.description()) + print "" + if ana.requiredBeams(): def pid_to_str(pid): if pid == 11: @@ -311,14 +325,18 @@ for bp in ana.requiredBeams(): beamstrs.append(pid_to_str(bp[0]) + " " + pid_to_str(bp[1])) print "Beams:", ", ".join(beamstrs) + if ana.requiredEnergies(): print "Beam energies:", "; ".join(["(%0.1f, %0.1f)" % (epair[0], epair[1]) for epair in ana.requiredEnergies()]), "GeV" else: print "Beam energies: ANY" - print "Run details:" - twrap = textwrap.TextWrapper(width=75, initial_indent=2*" ", subsequent_indent=4*" ") - for l in ana.runInfo().split("\n"): - print twrap.fill(l) + + if ana.runInfo(): + print "Run details:" + twrap = textwrap.TextWrapper(width=75, initial_indent=2*" ", subsequent_indent=4*" ") + for l in ana.runInfo().split("\n"): + print twrap.fill(l) + if ana.references(): print "" print "References:" Modified: branches/2011-07-aida2yoda/bin/rivet-mergeruns ============================================================================== --- branches/2011-07-aida2yoda/bin/rivet-mergeruns Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/bin/rivet-mergeruns Thu Oct 6 21:57:04 2011 (r3420) @@ -413,6 +413,152 @@ useOnePt("/ATLAS_2011_S8971293/d01-x01-y08", "7000", "600") useOnePt("/ATLAS_2011_S8971293/d01-x01-y09", "7000", "800") + ## ATLAS jet shapes + useOnePt("/ATLAS_2011_S8924791/d01-x01-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x01-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x02-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x02-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x03-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x03-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x04-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x04-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x05-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x05-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x06-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d01-x06-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d02-x01-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x01-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x02-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x02-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x03-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x03-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x04-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x04-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x05-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x05-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x06-y01", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d02-x06-y02", "7000", "40") + useOnePt("/ATLAS_2011_S8924791/d03-x01-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x01-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x02-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x02-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x03-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x03-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x04-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x04-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x05-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x05-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x06-y01", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d03-x06-y02", "7000", "60") + useOnePt("/ATLAS_2011_S8924791/d04-x01-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x01-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x02-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x02-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x03-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x03-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x04-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x04-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x05-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x05-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x06-y01", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d04-x06-y02", "7000", "80") + useOnePt("/ATLAS_2011_S8924791/d05-x01-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x01-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x02-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x02-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x03-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x03-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x04-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x04-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x05-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x05-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x06-y01", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d05-x06-y02", "7000", "110") + useOnePt("/ATLAS_2011_S8924791/d06-x01-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x01-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x02-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x02-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x03-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x03-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x04-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x04-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x05-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x05-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x06-y01", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d06-x06-y02", "7000", "160") + useOnePt("/ATLAS_2011_S8924791/d07-x01-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x01-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x02-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x02-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x03-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x03-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x04-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x04-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x05-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x05-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x06-y01", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d07-x06-y02", "7000", "210") + useOnePt("/ATLAS_2011_S8924791/d08-x01-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x01-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x02-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x02-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x03-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x03-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x04-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x04-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x05-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x05-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x06-y01", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d08-x06-y02", "7000", "260") + useOnePt("/ATLAS_2011_S8924791/d09-x01-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x01-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x02-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x02-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x03-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x03-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x04-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x04-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x05-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x05-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x06-y01", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d09-x06-y02", "7000", "310") + useOnePt("/ATLAS_2011_S8924791/d10-x01-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x01-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x02-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x02-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x03-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x03-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x04-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x04-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x05-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x05-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x06-y01", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d10-x06-y02", "7000", "400") + useOnePt("/ATLAS_2011_S8924791/d11-x01-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x01-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x02-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x02-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x03-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x03-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x04-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x04-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x05-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x05-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x06-y01", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d11-x06-y02", "7000", "500") + useOnePt("/ATLAS_2011_S8924791/d12-x01-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x01-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x02-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x02-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x03-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x03-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x04-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x04-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x05-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x05-y02", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x06-y01", "7000", "30") + useOnePt("/ATLAS_2011_S8924791/d12-x06-y02", "7000", "30") + ## Field analysis logging.info("Processing CDF_2001_S4751469") ## Angular distributions in different pT bins Modified: branches/2011-07-aida2yoda/bin/rivet-mkanalysis ============================================================================== --- branches/2011-07-aida2yoda/bin/rivet-mkanalysis Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/bin/rivet-mkanalysis Thu Oct 6 21:57:04 2011 (r3420) @@ -74,25 +74,27 @@ ## Extract some metadata from the name if it matches the standard pattern import re - re_stdana = re.compile(r"^(\w+)_(\d{4})_S(\d+)$") + re_stdana = re.compile(r"^(\w+)_(\d{4})_(I|S)(\d+)$") match = re_stdana.match(ANANAME) STDANA = False ANAEXPT = "<Insert the experiment name>" ANAYEAR = "<Insert year of publication>" - ANASPIRESID = "<Insert the SPIRES IRN ID>" + INSPIRE_SPIRES = None + ANAINSPIREID = "<Insert the Inspire ID>" if match: STDANA = True ANAEXPT = match.group(1) ANAYEAR = match.group(2) - ANASPIRESID = match.group(3) + INSPIRE_SPIRES = match.group(3) + ANAINSPIREID = match.group(4) KEYWORDS = { "ANANAME" : ANANAME, "ANAEXPT" : ANAEXPT, "ANAYEAR" : ANAYEAR, - "ANASPIRESID" : ANASPIRESID + "ANAREFREPO" : "Spires" if INSPIRE_SPIRES == "S" else "Inspire", + "ANAINSPIREID" : ANAINSPIREID } - ## Try to get bib info from SPIRES ANABIBKEY = "" ANABIBTEX = "" @@ -100,10 +102,10 @@ if STDANA: try: import spiresbib - logging.debug("Getting SPIRES biblio data for '%s'" % ANANAME) - bibkey, bibtex = spiresbib.get_bibtex_from_spires(ANASPIRESID) + logging.debug("Getting Inspire/SPIRES biblio data for '%s'" % ANANAME) + bibkey, bibtex = spiresbib.get_bibtex_from_repo(INSPIRE_SPIRES, ANAINSPIREID) except Exception, e: - logging.error("SPIRES oops: %s" % e) + logging.error("Inspire/SPIRES oops: %s" % e) if bibkey and bibtex: ANABIBKEY = bibkey ANABIBTEX = bibtex @@ -115,7 +117,7 @@ if STDANA: try: import urllib - hdurl = "http://hepdata.cedar.ac.uk/view/irn%s/aida" % ANASPIRESID + hdurl = "http://hepdata.cedar.ac.uk/view/irn%s/aida" % ANAINSPIREID logging.debug("Getting data file from HepData at %s" % hdurl) httpstream = urllib.urlopen(hdurl) aidastr = httpstream.read() @@ -131,10 +133,12 @@ if opts.INLINE: + KEYWORDS["ANAREFREPO_LOWER"] = KEYWORDS["ANAREFREPO"].lower() INLINEMETHODS=""" public: string experiment() const { return "%(ANAEXPT)s"; } string year() const { return "%(ANAYEAR)s"; } + string %(ANAREFREPO_LOWER)sId() const { return "%(ANAINSPIREID)s"; } string spiresId() const { return "%(ANASPIRESID)s"; } string collider() const { return ""; } string summary() const { return ""; } @@ -147,6 +151,7 @@ vector<string> references() const { return vector<string>(); } vector<std::string> todos() const { return vector<string>(); } """ % KEYWORDS + del KEYWORDS["ANAREFREPO_LOWER"] else: INLINEMETHODS="" @@ -176,10 +181,7 @@ /// Constructor %(ANANAME)s() : Analysis("%(ANANAME)s") - { - /// @todo Set whether your finalize method needs the generator cross section - setNeedsCrossSection(true); - } + { } //@} @@ -276,7 +278,7 @@ Summary: <Insert short %(ANANAME)s description> Experiment: %(ANAEXPT)s Collider: <Insert %(ANANAME)s collider> -SpiresID: %(ANASPIRESID)s +%(ANAREFREPO)sID: %(ANAINSPIREID)s Status: UNVALIDATED Authors: - Your Name <your at email.address> @@ -289,6 +291,7 @@ efficiency cut(s) that may be needed; essentially any details needed to set up a generator to reproduce the data.> NumEvents: 1000000 +NeedCrossSection: no #Beams: <Insert beam pair(s), e.g. [p-, p+] or [[p-, e-], [p-, e+]]> #Energies: <Insert list of run energies or beam energy pairs in GeV, # e.g. [1960] or [[8.0, 3.5]] or [630, 1800]. Order pairs to match "Beams"> Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_CONF_2010_049.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_CONF_2010_049.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_CONF_2010_049.info Thu Oct 6 21:57:04 2011 (r3420) @@ -27,3 +27,4 @@ probability that a particular particle carries a fixed fraction of the jet momentum (fragmentation function) is also measured. All data is corrected to the particle level. ATTENTION - Data read from plots! +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8817804.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8817804.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8817804.info Thu Oct 6 21:57:04 2011 (r3420) @@ -23,6 +23,7 @@ $0.3<|y|<0.8$, $0.8<|y|<1.2$, $1.2<|y|<2.1$, $2.1<|y|<2.8$. Di-jet $\chi$ spectra are plotted in bins of di-jet mass $340~GeV<m_{12}<520~GeV$, $520~GeV<m_{12}<800~GeV$ and $800~GeV<m_{12}<1200~GeV$. +NeedCrossSection: yes BibKey: Aad:2010wv BibTeX: '@Article{Aad:2010wv, author = "Aad, G. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8914702.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8914702.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8914702.info Thu Oct 6 21:57:04 2011 (r3420) @@ -12,14 +12,15 @@ RunInfo: Inclusive photon+X events (primary gamma+jet events) at $\sqrt{s} = 7$~TeV. NumEvents: 1000000 -Beams: [p+, p+] -Energies: [7000] +Beams: [p+, p+] +Energies: [7000] PtCuts: [15] Description: - 'A measurement of the cross section for inclusive isolated photon production at $sqrt{s} = 7$ TeV. - The measurement covers three ranges in $|\eta|$: [0.00,0.60), [0.60,1.37), and [1.52,1.81), for + 'A measurement of the cross section for inclusive isolated photon production at $sqrt{s} = 7$ TeV. + The measurement covers three ranges in $|\eta|$: [0.00,0.60), [0.60,1.37), and [1.52,1.81), for $E_T^\gamma>15$~GeV. The measurement uses 880nb$^{-1}$ of integrated luminosity collected with the ATLAS detector.' +NeedCrossSection: yes BibKey: Collaboration:2010sp BibTeX: '@Article{Collaboration:2010sp, author = "Collaboration, The ATLAS", Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8919674.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8919674.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2010_S8919674.info Thu Oct 6 21:57:04 2011 (r3420) @@ -26,6 +26,7 @@ The results, based on an integrated luminosity of 1.3 pb-1, have been corrected for all known detector effects and are quoted in a limited and well-defined range of jet and lepton kinematics.' +NeedCrossSection: yes BibKey: Aad:2010pg BibTeX: '@Article{Aad:2010pg, author = "Collaboration, The ATLAS", Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_I919017.info Thu Oct 6 21:57:04 2011 (r3420) @@ -22,6 +22,7 @@ transverse momentum, radius w.r.t jet axis distributions, with jets constructed from charged tracks with $pT > 300$ MeV, using the anti-$k_T$ jet algorithm with $R = 0.4, 0.6$. +NeedCrossSection: yes BibKey: Aad:2011gn BibTeX: '@article{Aad:2011gn, author = "Aad, Georges and others", Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9120807.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9120807.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9120807.info Thu Oct 6 21:57:04 2011 (r3420) @@ -21,6 +21,7 @@ for isolated photons with $|\eta|<2.37$ and $E_T^\gamma>16$~GeV. The measurement uses 37 pb$^{-1}$ of integrated luminosity collected with the ATLAS detector.' +NeedCrossSection: yes BibTeX: '@Article{Aad:2011mh, author = "Aad, Georges and others", title = "{Measurement of the isolated di-photon cross-section in Modified: branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9128077.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9128077.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/ATLAS_2011_S9128077.info Thu Oct 6 21:57:04 2011 (r3420) @@ -20,6 +20,7 @@ 2.4 pb-1. Results on multi-jet cross sections are presented differential in pT of the four leading jets, HT. Additionally three-to-two jet fractions are presented differential in different observables.' +NeedCrossSection: yes BibKey: Collaboration:2011tq BibTeX: '@Article{Collaboration:2011tq, author = "Collaboration, ATLAS", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_1988_S1865951.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_1988_S1865951.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_1988_S1865951.info Thu Oct 6 21:57:04 2011 (r3420) @@ -18,6 +18,7 @@ Beams: [p-, p+] Energies: [630, 1800] PtCuts: [0] +NeedCrossSection: yes BibKey: Abe:1988yu BibTeX: '@Article{Abe:1988yu, author = "Abe, F. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_1996_S3108457.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_1996_S3108457.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_1996_S3108457.info Thu Oct 6 21:57:04 2011 (r3420) @@ -19,6 +19,7 @@ Description: Properties of two-, three-, four-, five-, and six-jet events... Multijet-mass, leading jet angle, jet pT. +NeedCrossSection: yes ToDo: - This is at 1800 GeV only, or also 630 GeV? BibKey: Abe:1995rw Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_1998_S3618439.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_1998_S3618439.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_1998_S3618439.info Thu Oct 6 21:57:04 2011 (r3420) @@ -17,11 +17,12 @@ Energies: [1800] PtCuts: [0] Description: - Measurement of the differential cross section + Measurement of the differential cross section $\mathrm{d}\sigma/\mathrm{d}E_\perp^j$ for the - production of multijet events in $p\bar{p}$ collisions where the - sum is over all jets with transverse energy - $E_\perp^j > E_\perp^\mathrm{min}$. + production of multijet events in $p\bar{p}$ collisions where the + sum is over all jets with transverse energy + $E_\perp^j > E_\perp^\mathrm{min}$. +NeedCrossSection: yes BibKey: Abe:1997eua BibTeX: '@Article{Abe:1997eua, author = "Abe, F. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4155203.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4155203.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4155203.info Thu Oct 6 21:57:04 2011 (r3420) @@ -35,6 +35,7 @@ definition, since the Rivet implementation reconstructs the Z momentum from the dilepton pair with finite cones for QED bremstrahlung summation, rather than non-portable direct use of the (sometimes absent) Z in the event record. +NeedCrossSection: yes BibKey: Affolder:1999jh BibTeX: '@Article{Affolder:1999jh, author = "Affolder, Anthony Allen and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4266730.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4266730.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2000_S4266730.info Thu Oct 6 21:57:04 2011 (r3420) @@ -21,6 +21,7 @@ Measurement of the cross section for production of two or more jets as a function of dijet mass in the range 180 to 1000 GeV. It is based on an integrated luminosity of $86 \mathrm{pb}^{-1}$. +NeedCrossSection: yes BibKey: Affolder:1999ua BibTeX: '@Article{Affolder:1999ua, author = "Affolder, Anthony Allen and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4517016.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4517016.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4517016.info Thu Oct 6 21:57:04 2011 (r3420) @@ -18,13 +18,14 @@ Energies: [1800] PtCuts: [0] Description: - A measurement of the two-jet differential cross section, + A measurement of the two-jet differential cross section, $\mathrm{d}^3\sigma/\mathrm{d}E_T \, \mathrm{d}\eta_1 \, \mathrm{d}\eta_2$, based on an integrated luminosity of $86 \mathrm{pb}^{-1}$. The differential cross section is measured as a function of the transverse energy, $E_\perp$, of a jet in the pseudorapidity region $0.1 < |\eta_1| < 0.7$ for four different pseudorapidity bins of a second jet restricted to $0.1 < |\eta_2| < 3.0$. +NeedCrossSection: yes BibKey: Affolder:2000ew BibTeX: '@Article{Affolder:2000ew, author = "Affolder, Anthony Allen and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4563131.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4563131.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2001_S4563131.info Thu Oct 6 21:57:04 2011 (r3420) @@ -21,6 +21,7 @@ Measurement of the inclusive jet cross section for jet transverse energies from 40 to 465 GeV in the pseudo-rapidity range $0.1<|\eta|<0.7$. The results are based on 87 $\mathrm{pb}^{-1}$ of data. +NeedCrossSection: yes BibKey: Affolder:2001fa BibTeX: '@Article{Affolder:2001fa, author = "Affolder, Anthony Allen and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2005_S6080774.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2005_S6080774.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2005_S6080774.info Thu Oct 6 21:57:04 2011 (r3420) @@ -25,6 +25,7 @@ 207~pb$^{-1}$ as a function of the diphoton mass, the transverse momentum of the diphoton system, and the azimuthal angle between the two photons. +NeedCrossSection: yes BibKey: Acosta:2004sn BibTeX: '@Article{Acosta:2004sn, author = "Acosta, Darin E. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6450792.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6450792.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6450792.info Thu Oct 6 21:57:04 2011 (r3420) @@ -23,6 +23,7 @@ transverse momentum range from 61 to 620 GeV/c in $0.1 < |y| < 0.7$. This analysis has been updated with more data in more rapidity bins in CDF_2008_S7828950. +NeedCrossSection: yes BibKey: Abulencia:2005yg BibTeX: '@Article{Abulencia:2005yg, author = "Abulencia, A. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6653332.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6653332.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2006_S6653332.info Thu Oct 6 21:57:04 2011 (r3420) @@ -20,12 +20,13 @@ PtCuts: [10] Energies: [1960] Description: - Measurement of the b jet cross section in events with Z boson in p - pbar collisions at center-of-mass energy sqrt(s) = 1.96 TeV. The data + Measurement of the $b$-jet cross section in events with $Z$ boson in + $p\bar{p}$ collisions at center-of-mass energy sqrt(s) = 1.96 TeV. The data cover jet transverse momenta above 20 GeV and jet pseudorapidities in - the range -1.5 to 1.5. Z bosons are identified in their electron and + the range -1.5 to 1.5. $Z$ bosons are identified in their electron and muon decay modes in an invariant dilepton mass range between 66 and 116 GeV. +NeedCrossSection: yes BibKey: Abulencia:2006ce BibTeX: '@Article{Abulencia:2006ce, author = "Abulencia, A. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2007_S7057202.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2007_S7057202.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2007_S7057202.info Thu Oct 6 21:57:04 2011 (r3420) @@ -28,6 +28,7 @@ maximum around 700~GeV. The inclusive jet pT is plotted in bins of rapidity $|y|<0.1$, $0.1<|y|<0.7$, $0.7<|y|<1.1$, $1.1<|y|<1.6$ and $1.6<|y|<2.1$. +NeedCrossSection: yes BibKey: Abulencia:2007ez BibTeX: '@Article{Abulencia:2007ez, author = "Abulencia, A. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7540469.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7540469.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7540469.info Thu Oct 6 21:57:04 2011 (r3420) @@ -23,6 +23,7 @@ TeV, based on an integrated luminosity of $1.7~\text{fb}^{-1}$. The measurements cover the rapidity region $|y_\text{jet}| < 2.1$ and the transverse momentum range $pT^\text{jet} > 30~\text{GeV}/c$. +NeedCrossSection: yes BibKey: :2007cp BibTeX: '@Article{:2007cp, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7541902.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7541902.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7541902.info Thu Oct 6 21:57:04 2011 (r3420) @@ -12,8 +12,8 @@ - arXiv:0711.4044 [hep-ex] - Phys.Rev.D77:011108,2008 RunInfo: - Requires the process $p\bar{p} \rightarrow {W} \rightarrow {e}\nu$. - Additional hard jets will also have to be included to get a good + Requires the process $p\bar{p} \rightarrow {W} \rightarrow {e}\nu$. + Additional hard jets will also have to be included to get a good description. The LO process in Herwig is set with IPROC=1451. NumEvents: 1000000 Beams: [p-, p+] @@ -30,7 +30,7 @@ $\times$ BR($W \rightarrow{e}\nu$) is made, where d$E_T(n^{th}$-jet) is the Et of the n$^{th}$-highest Et jet above 20 GeV. A measurement of the total cross section, $\sigma(p\bar{p} \rightarrow W + \geq$ - n-jet) $\times$ BR($W \rightarrow{e}\nu)$ with $E_T(n^{th}-jet) > 25$ + $n$-jet) $\times$ BR($W \rightarrow{e}\nu)$ with $E_T(n^{th}-jet) > 25$ GeV is also made. Both measurements are made for jets with $|\eta| < 2$ and for a limited region of the $W \rightarrow{e}\nu$ decay phase space; $|\eta^{e}| < 1.1$, $p_{T}^{e} > 20$ GeV, $p_{T}^{\nu} > 30$ @@ -39,6 +39,7 @@ jet(s) predictions. These measurements can be used to test and tune QCD predictions for the number of jets in and kinematics of $W$ + jets events. +NeedCrossSection: yes BibKey: Aaltonen:2007ip BibTeX: '@Article{Aaltonen:2007ip, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7828950.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7828950.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S7828950.info Thu Oct 6 21:57:04 2011 (r3420) @@ -27,6 +27,7 @@ using the cone-based Midpoint jet clustering algorithm in rapidity bins within $|y|<2.1$. This measurement can be used to provide increased precision in PDFs at high parton momentum fraction $x$. +NeedCrossSection: yes BibKey: Aaltonen:2008eq BibTeX: '@Article{Aaltonen:2008eq, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S8093652.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S8093652.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2008_S8093652.info Thu Oct 6 21:57:04 2011 (r3420) @@ -19,6 +19,7 @@ Dijet mass spectrum from 0.2 TeV to 1.4 TeV in $p \bar{p}$ collisions at $\sqrt{s} = 1.96$ TeV, based on an integrated luminosity of 1.13 fb$^{-1}$. +NeedCrossSection: yes BibKey: Aaltonen:2008dn BibTeX: '@Article{Aaltonen:2008dn, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8233977.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8233977.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8233977.info Thu Oct 6 21:57:04 2011 (r3420) @@ -13,7 +13,7 @@ - doi:10.1103/PhysRevD.79.112005 - arXiv:0904.1098 [hep-ex] RunInfo: - $p\bar{p}$ QCD interactions at 1960~GeV. Particles with $c \\tau > {}$10 mm + $p\bar{p}$ QCD interactions at 1960~GeV. Particles with $c \\tau > {}$10 mm should be set stable. NumEvents: 1000000 Beams: [p-, p+] @@ -22,7 +22,8 @@ Description: Niccolo Moggi's min bias analysis. Minimum bias events are used to measure the average track pT vs. charged multiplicity, a track pT - distribution and an inclusive $\sum E_T$ distribution. + distribution and an inclusive $\sum E_T$ distribution. +NeedCrossSection: yes BibKey: Aaltonen:2009ne BibTeX: '@Article{Aaltonen:2009ne, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8383952.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8383952.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8383952.info Thu Oct 6 21:57:04 2011 (r3420) @@ -10,7 +10,7 @@ References: - arXiv:0908.3914 [hep-ex] RunInfo: - $p \bar{p} \to e^+ e^-$ + jets at 1960 GeV. Needs mass cut on lepton pair to + $p \bar{p} \to e^+ e^-$ + jets at 1960 GeV. Needs mass cut on lepton pair to avoid photon singularity, looser than $66 < m_{ee} < 116$ GeV NumEvents: 1000000 Beams: [p-, p+] @@ -21,6 +21,7 @@ $\mathrm{d}\sigma/\mathrm{d}y$, for $q\bar{q}\to \gamma^{*}/Z\to e^{+}e^{-}$ events in the $Z$ boson mass region ($66<M_{ee}<116$ GeV/c$^2$) produced in $p\bar{p}$ collisions at $\sqrt{s}=1.96$ TeV with 2.1 fb$^{-1}$ of integrated luminosity. +NeedCrossSection: yes BibKey: Aaltonen:2009pc BibTeX: '@Article{Aaltonen:2009pc, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8436959.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8436959.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/CDF_2009_S8436959.info Thu Oct 6 21:57:04 2011 (r3420) @@ -22,6 +22,7 @@ and the transverse energy range $E_T^\gamma>30$~GeV and is based on 2.5~fb$^{-1}$ of integrated luminosity. The cross section is measured differential in $E_\perp(\gamma)$. +NeedCrossSection: yes BibKey: Aaltonen:2009ty BibTeX: '@Article{Aaltonen:2009ty, author = "Aaltonen, T. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2000_S4480767.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2000_S4480767.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2000_S4480767.info Thu Oct 6 21:57:04 2011 (r3420) @@ -22,6 +22,7 @@ function of its transverse momentum. The data were collected by the D0 experiment at the Fermilab Tevatron Collider during 1994-1995 and correspond to an integrated luminosity of 85 pb$^{-1}$. +NeedCrossSection: yes BibKey: Abbott:2000xv BibTeX: '@Article{Abbott:2000xv, author = "Abbott, B. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2001_S4674421.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2001_S4674421.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2001_S4674421.info Thu Oct 6 21:57:04 2011 (r3420) @@ -21,8 +21,8 @@ Description: Measurement of differential W/Z boson cross section and ratio in $p \bar{p}$ collisions at center-of-mass energy sqrt(s) = 1.8 TeV. The data - cover electrons and neutrinos in a pseudo-rapidity range of -2.5 to - 2.5. + cover electrons and neutrinos in a pseudo-rapidity range of -2.5 to 2.5. +NeedCrossSection: yes BibKey: Abazov:2001nta BibTeX: '@Article{Abazov:2001nta, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2006_S6438750.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2006_S6438750.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2006_S6438750.info Thu Oct 6 21:57:04 2011 (r3420) @@ -14,8 +14,8 @@ - doi:10.1016/j.physletb.2006.04.048 - arXiv:hep-ex/0511054 (plus erratum) RunInfo: - ppbar collisions at sqrt(s) = 1960 GeV. Requires gamma + jet (q,qbar,g) - hard processes, which for Pythia 6 means MSEL=10 for with MSUB indices + ppbar collisions at sqrt(s) = 1960 GeV. Requires gamma + jet (q,qbar,g) + hard processes, which for Pythia 6 means MSEL=10 for with MSUB indices 14, 18, 29, 114, 115 enabled. NumEvents: 1000000 Beams: [p-, p+] @@ -31,6 +31,7 @@ processes, the latter of which is also sensitive to the gluon PDF. The initial state radiation / resummation formalisms are sensitive to the resulting photon pT spectrum +NeedCrossSection: yes BibKey: Abazov:2005wc BibTeX: '@Article{Abazov:2005wc, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7662670.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7662670.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7662670.info Thu Oct 6 21:57:04 2011 (r3420) @@ -13,7 +13,7 @@ - doi:10.1103/PhysRevLett.101.062001 - arXiv:0802.2400v3 [hep-ex] RunInfo: - QCD events at sqrt(s) = 1960 GeV. A pTmin cut is probably necessary since + QCD events at sqrt(s) = 1960 GeV. A pTmin cut is probably necessary since the lowest jet pT bin is at 50 GeV NumEvents: 1000000 Beams: [p-, p+] @@ -24,6 +24,7 @@ center-of-mass energy sqrt(s) = 1.96 TeV. The data cover jet transverse momenta from 50--600 GeV and jet rapidities in the range -2.4 to 2.4. +NeedCrossSection: yes BibKey: :2008hua BibTeX: '@Article{:2008hua, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7719523.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7719523.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7719523.info Thu Oct 6 21:57:04 2011 (r3420) @@ -14,8 +14,8 @@ - doi:10.1016/j.physletb.2008.06.076 - arXiv:0804.1107v2 [hep-ex] RunInfo: - "Produce only gamma + jet ($q,\\bar{q},g$) hard processes (for Pythia 6, this means MSEL=10 - and MSUB indices 14, 29 & 115 enabled). The lowest bin edge is at 30 GeV, so a kinematic + "Produce only gamma + jet ($q,\\bar{q},g$) hard processes (for Pythia 6, this means MSEL=10 + and MSUB indices 14, 29 & 115 enabled). The lowest bin edge is at 30 GeV, so a kinematic pTmin cut is probably required to fill the histograms." NumEvents: 1000000 Beams: [p-, p+] @@ -35,6 +35,7 @@ jet. MC predictions have trouble with simultaneously describing the measured normalization and $pT^\gamma$ dependence of the cross section in any of the four measured regions. +NeedCrossSection: yes BibKey: Abazov:2008er BibTeX: '@Article{Abazov:2008er, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7863608.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7863608.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2008_S7863608.info Thu Oct 6 21:57:04 2011 (r3420) @@ -26,6 +26,7 @@ and rapidity of the leading jet in the di-muon channel in $p \bar{p}$ collisions at $\sqrt{s}$ = 1.96 TeV, based on an integrated luminosity of 1.0 fb$^{-1}$. +NeedCrossSection: yes BibKey: Abazov:2008ez BibTeX: '@Article{Abazov:2008ez, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2009_S8349509.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2009_S8349509.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2009_S8349509.info Thu Oct 6 21:57:04 2011 (r3420) @@ -29,6 +29,7 @@ describing the data. Using these measurements as inputs in tuning event generators will increase the experimental sensitivity to rare signals. +NeedCrossSection: yes BibKey: Abazov:2009pp BibTeX: '@Article{Abazov:2009pp, author = "Abazov, Victor Mukhamedovich and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8566488.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8566488.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8566488.info Thu Oct 6 21:57:04 2011 (r3420) @@ -22,6 +22,7 @@ event is measured using 0.7 fb$^{-1}$ of data. The measurement is performed in six rapidity regions up to $|y|_\text{max}=2.4$. +NeedCrossSection: yes BibKey: Abazov:2010fr BibTeX: '@Article{Abazov:2010fr, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8570965.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8570965.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8570965.info Thu Oct 6 21:57:04 2011 (r3420) @@ -29,6 +29,7 @@ normalisation in the double differential cross sections. This has been reported to and fixed by the authors in v2 and the journal submission. HepData as well as the Rivet analysis have also been updated. +NeedCrossSection: yes BibKey: Abazov:2010ah BibTeX: '@Article{Abazov:2010ah, author = "Abazov, V. M. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8671338.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8671338.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/D0_2010_S8671338.info Thu Oct 6 21:57:04 2011 (r3420) @@ -26,6 +26,7 @@ Cross section as a function of pT of the Z boson decaying into muons in $p \bar{p}$ collisions at $\sqrt{s}$ = 1.96 TeV, based on an integrated luminosity of 0.97 fb$^{-1}$. +NeedCrossSection: yes BibKey: Abazov:2010kn BibTeX: '@Article{Abazov:2010kn, author = "Abazov, Victor Mukhamedovich and others", Modified: branches/2011-07-aida2yoda/data/anainfo/MC_DIPHOTON.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_DIPHOTON.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_DIPHOTON.info Thu Oct 6 21:57:04 2011 (r3420) @@ -9,3 +9,4 @@ PtCuts: [0] Description: Different observables related to the two photons +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_HJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_HJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_HJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -3,7 +3,6 @@ Status: VALIDATED Authors: - Frank Siegert <frank.siegert at cern.ch> -References: RunInfo: $h [\to \tau^+ \tau^-]$ + jets. NumEvents: 1000000 @@ -13,3 +12,4 @@ multiplicity, $\Delta\eta(h, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$, differential jet rates 0->1, 1->2, 2->3, 3->4, and integrated 0--4 jet rates. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_JETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_JETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_JETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -11,3 +11,4 @@ Description: Jets with $p_\perp>20$ GeV are constructed with a $k_\perp$ jet finder with $D=0.7$ and projected onto many different observables. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_PHOTONJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_PHOTONJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_PHOTONJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -10,3 +10,4 @@ PtCuts: [0] Description: Different observables related to the photon and extra jets. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_VH2BB.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_VH2BB.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_VH2BB.info Thu Oct 6 21:57:04 2011 (r3420) @@ -16,3 +16,4 @@ PtCuts: [0] Description: 'Various plots for characterising the process $V H \to b\bar{b}$' +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_WJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_WJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_WJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -10,6 +10,7 @@ PtCuts: [0] Description: Available observables are W mass, pT of jets 1-4, jet multiplicity, - $\Delta\eta(W, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$, - differential jet rates 0->1, 1->2, 2->3, 3->4, integrated 0--4 jet + $\Delta\eta(W, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$, + differential jet rates 0->1, 1->2, 2->3, 3->4, integrated 0--4 jet rates. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_WPOL.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_WPOL.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_WPOL.info Thu Oct 6 21:57:04 2011 (r3420) @@ -10,4 +10,4 @@ Description: 'Observables sensitive to the polarisation of the W boson: A0, ... A7, fR, fL, f0, separately for W+ and W-.' - +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_WWJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_WWJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_WWJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -13,3 +13,4 @@ related to properties of the WW-pair momentum, correlations between the WW, properties of the W bosons, properties of the leptons, correlations between the opposite charge leptons and correlations with jets. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_XS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_XS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_XS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -1,12 +1,12 @@ Name: MC_XS -Summary: MC analysis for total cross section +Summary: MC analysis for process total cross section Status: VALIDATED Authors: - Marek Schoenherr <marek.schoenherr at tu-dresden.de> -RunInfo: - "For any process." -NumEvents: any +RunInfo: Suitable for any process. +NumEvents: 1000 PtCuts: [0] Description: - Analysis for bookkeeping of the total cross section, number of generated - events and the ratio of events with positive and negeative weights. + Analysis for bookkeeping of the total cross section, number of generated + events and the ratio of events with positive and negative weights. +NeedsCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_ZJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_ZJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_ZJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -5,12 +5,13 @@ - Frank Siegert <frank.siegert at cern.ch> References: RunInfo: - $e^+ e^-$ + jets analysis. Needs mass cut on lepton pair to avoid + $e^+ e^-$ + jets analysis. Needs mass cut on lepton pair to avoid photon singularity, e.g. a min range of $66 < m_{ee} < 116$ GeV NumEvents: 1000000 PtCuts: [0] Description: Available observables are Z mass, pT of jets 1-4, jet multiplicity, - $\Delta\eta(Z, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$, - differential jet rates 0->1, 1->2, 2->3, 3->4, integrated 0--4 jet + $\Delta\eta(Z, \text{jet1})$, $\Delta R(\text{jet2}, \text{jet3})$, + differential jet rates 0->1, 1->2, 2->3, 3->4, integrated 0--4 jet rates. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/MC_ZZJETS.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/MC_ZZJETS.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/MC_ZZJETS.info Thu Oct 6 21:57:04 2011 (r3420) @@ -14,3 +14,4 @@ related to properties of the ZZ-pair momentum, correlations between the ZZ, properties of the Z bosons, properties of the leptons, correlations between the opposite charge leptons and correlations with jets. +NeedCrossSection: yes Modified: branches/2011-07-aida2yoda/data/anainfo/STAR_2006_S6870392.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/STAR_2006_S6870392.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/STAR_2006_S6870392.info Thu Oct 6 21:57:04 2011 (r3420) @@ -19,6 +19,7 @@ Description: Inclusive jet cross section as a function of pT in pp collisions at $\sqrt{s} = 200$ GeV, measured by the STAR experiment at RHIC. +NeedCrossSection: yes BibKey: Abelev:2006uq BibTeX: '@Article{Abelev:2006uq, author = "Abelev, B. I. and others", Modified: branches/2011-07-aida2yoda/data/anainfo/UA1_1990_S2044935.info ============================================================================== --- branches/2011-07-aida2yoda/data/anainfo/UA1_1990_S2044935.info Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/anainfo/UA1_1990_S2044935.info Thu Oct 6 21:57:04 2011 (r3420) @@ -11,13 +11,14 @@ References: - "Nucl.Phys.B353:261,1990" RunInfo: QCD min bias events at sqrtS = 63, 200, 500 and 900 GeV. -Description: +Description: Particle multiplicities, transverse momenta and transverse energy distributions at the UA1 experiment, at energies of 200, 500 and 900 GeV (with one plot at 63 GeV for comparison). Beams: [p-, p+] Energies: [63, 200, 500, 900] PtCuts: [0] +NeedCrossSection: yes BibKey: Albajar:1989an BibTeX: '@Article{Albajar:1989an, author = "Albajar, C. and others", Modified: branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_S8924791.plot ============================================================================== --- branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_S8924791.plot Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/data/plotinfo/ATLAS_2011_S8924791.plot Thu Oct 6 21:57:04 2011 (r3420) @@ -1,869 +1,588 @@ +## BEGIN PLOT /ATLAS_2011_S8924791/d..-x..-y01 +XLabel=$r$ +YLabel=$\rho(r)$ +## END PLOT + ## BEGIN PLOT /ATLAS_2011_S8924791/d..-x..-y02 +XLabel=$r$ +YLabel=$\Psi(r)$ LogY=0 LegendYPos=0.6 ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--40\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d01-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--40\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 40$--60\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d02-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 40$--60\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 60$--80\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d03-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 60$--80\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 80$--110\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d04-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 80$--110\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 110$--160\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d05-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 110$--160\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 160$--210\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d06-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 160$--210\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 210$--260\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d07-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 210$--260\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 260$--310\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d08-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 260$--310\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 310$--400\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d09-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 310$--400\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 400$--500\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d10-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 400$--500\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 500$--600\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d11-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 500$--600\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x01-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x01-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 0.0$--0.3 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x02-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x02-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 0.3$--0.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x03-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x03-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 0.8$--1.2 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x04-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x04-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 1.2$--2.1 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x05-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x05-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 2.1$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x06-y01 Title=Jet shape $\rho$ for $p_\perp \in 30$--600\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\rho(r)$ ## END PLOT ## BEGIN PLOT /ATLAS_2011_S8924791/d12-x06-y02 Title=Jet shape $\Psi$ for $p_\perp \in 30$--600\,GeV, $y \in 0.0$--2.8 -XLabel=$r$ -YLabel=$\Psi(r)$ ## END PLOT Modified: branches/2011-07-aida2yoda/doc/make-plots.txt ============================================================================== --- branches/2011-07-aida2yoda/doc/make-plots.txt Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/doc/make-plots.txt Thu Oct 6 21:57:04 2011 (r3420) @@ -209,6 +209,11 @@ -------------------- Distance between the plot and the paper edge. +-------------------- +FrameColor=<color> +-------------------- +Background color for the margin around the plot. + Legends ^^^^^^^ @@ -349,7 +354,8 @@ `GofLegend` calculates the GoF for all histograms and displays the results in the legend. With `GofFrame` you can specify a single histogram for which the GoF result will be shown in the legend and used to assign a color to the plot -margins. You can use +margins. Note that `FrameColor` overrides the color choice for the margin. +You can use -------------------- GofFrameColor=<colorthresholds> @@ -357,7 +363,8 @@ to specify the thresholds for the frame color. This option takes a list of `<threshold>:<color>` pairs, separated by whitespace. The default is -`GofFrameColor=0:green 3:yellow 6:red!70`. +`GofFrameColor=0:green 3:yellow 6:red!70`. Again, if you use `FrameColor`, +this option is disabled. Color Palettes for 2-dim Plots Modified: branches/2011-07-aida2yoda/doc/mk-analysis-html ============================================================================== --- branches/2011-07-aida2yoda/doc/mk-analysis-html Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/doc/mk-analysis-html Thu Oct 6 21:57:04 2011 (r3420) @@ -60,9 +60,14 @@ page += "<h3 id='%s'>%s</h3>\n" % (aname, aname) page += "<b>%s</b><br/>\n" % ana.summary() page += "<b>Experiment:</b> %s (%s)<br/>\n" % (ana.experiment(), ana.collider()) - spiresbase = "http://inspire-hep.net/search?p=find+key" - page += "<b>Spires ID:</b> <a href='%s+%s'>%s</a><br/>\n" % \ - (spiresbase, ana.spiresId(), ana.spiresId()) + if ana.inspireId(): + spiresbase = "http://inspire-hep.net/record" + page += "<b>Inspire ID:</b> <a href='%s/%s'>%s</a><br/>\n" % \ + (spiresbase, ana.inspireId(), ana.inspireId()) + elif ana.spiresId(): + spiresbase = "http://inspire-hep.net/search?p=find+key" + page += "<b>Spires ID:</b> <a href='%s+%s'>%s</a><br/>\n" % \ + (spiresbase, ana.spiresId(), ana.spiresId()) page += "<b>Status:</b> %s<br/>\n" % ana.status() Modified: branches/2011-07-aida2yoda/doc/mk-analysis-latex ============================================================================== --- branches/2011-07-aida2yoda/doc/mk-analysis-latex Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/doc/mk-analysis-latex Thu Oct 6 21:57:04 2011 (r3420) @@ -99,7 +99,11 @@ if ana.collider(): page += " (%s)" % ana.collider() page += "\\newline\n" - if ana.spiresId(): + if ana.inspireId(): + spiresbase = "http://inspire-hep.net/record" + page += "\\textbf{Inspire ID:} \\href{%s+%s}{%s}\\newline\n" % \ + (spiresbase, ana.inspireId(), ana.inspireId()) + elif ana.spiresId(): spiresbase = "http://inspire-hep.net/search?p=find+key" page += "\\textbf{Spires ID:} \\href{%s+%s}{%s}\\newline\n" % \ (spiresbase, ana.spiresId(), ana.spiresId()) Modified: branches/2011-07-aida2yoda/pyext/spiresbib.py ============================================================================== --- branches/2011-07-aida2yoda/pyext/spiresbib.py Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/pyext/spiresbib.py Thu Oct 6 21:57:04 2011 (r3420) @@ -6,24 +6,29 @@ usage = """%prog <spiresid> [<spiresid2> ...] -Given SPIRES paper IDs, fetch the corresponding BibTeX db entry from the SPIRES -Web interface and write it to stdout. +Given Inspire and SPIRES paper IDs, fetch the corresponding BibTeX db entry from +the SPIRES Web interface and write it to stdout. Prefix the code with I or S +appropriately. """ -def fetch_spires_bibtex(spiresid): - spiresurl = "http://inspire-hep.net/search?p=find+key+%s&of=hx" % str(spiresid) - logging.debug("Downloading SPIRES BibTeX from %s" % spiresurl) - hreq = urllib2.urlopen(spiresurl) +def fetch_bibtex(iscode, refid): + if iscode.upper() == "I": + url = "http://inspire-hep.net/record/%s/export/hx" % str(refid) + logging.debug("Downloading Inspire BibTeX from %s" % url) + elif iscode.upper() == "S": + url = "http://inspire-hep.net/search?p=find+key+%s&of=hx" % str(refid) + logging.debug("Downloading SPIRES BibTeX from %s" % url) + hreq = urllib2.urlopen(url) bibtexhtml = hreq.read() hreq.close() #logging.debug(bibtexhtml) return bibtexhtml -def extract_bibtex(spireshtml): +def extract_bibtex(html): ## Extract BibTeX block from HTML re_spiresbibtex = re.compile(r'<pre>(.*?)</pre>', re.MULTILINE | re.DOTALL) - m = re_spiresbibtex.search(spireshtml) + m = re_spiresbibtex.search(html) if m is None: return None, None bib = m.group(1).strip() @@ -39,18 +44,18 @@ return key, bib -def get_bibtex_from_spires(spiresid): - html = fetch_spires_bibtex(spiresid) +def get_bibtex_from_repo(iscode, refid): + html = fetch_bibtex(iscode, refid) key, bibtex = extract_bibtex(html) return key, bibtex -def get_bibtexs_from_spires(spiresids): +def get_bibtexs_from_repos(iscodes_refids): bibdb = {} - for spiresid in spiresids: - key, bibtex = get_bibtex_from_spires(spiresid) + for iscode, refid in iscodes_refids: + key, bibtex = get_bibtex_from_repo(iscode, refid) if key and bibtex: - bibdb[spiresid] = (key, bibtex) + bibdb[refid] = (key, bibtex) return bibdb @@ -61,8 +66,10 @@ opts, args = parser.parse_args() ## Make individual bibinfo files - for sid in args: - key, bibtex = get_bibtex_from_spires(sid) + for arg in args: + iscode = arg[0] + refid = arg[1:] + key, bibtex = get_bibtex_from_repo(iscode, refid) import sys f = sys.stdout f.write("BibKey: %s\n" % key) @@ -73,8 +80,8 @@ # for sid, (key, bibtex) in bibdb.iteritems(): # print key, "=>\n", bibtex - # ## Pickle ref db + # ## Pickle ref db9151176 # import cPickle as pickle - # fpkl = open("spiresbib.pkl", "w") + # fpkl = open("spiresbib.pkl", "w")repo # pickle.dump(bibdb) # fpkl.close() Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -16,10 +16,7 @@ /// Constructor ALICE_2010_S8624100() : Analysis("ALICE_2010_S8624100") - { - /// @todo Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,10 +17,7 @@ ALICE_2010_S8625980() : Analysis("ALICE_2010_S8625980"), _Nevt_after_cuts(0.0) - { - /// @todo Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,7 @@ ALICE_2010_S8706239() : Analysis("ALICE_2010_S8706239"), _Nevt_after_cuts(0.0) - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -11,9 +11,9 @@ class ATLAS_2010_CONF_2010_049 : public Analysis { public: - ATLAS_2010_CONF_2010_049() : Analysis("ATLAS_2010_CONF_2010_049") { - setNeedsCrossSection(true); - } + ATLAS_2010_CONF_2010_049() + : Analysis("ATLAS_2010_CONF_2010_049") + { } void init() { Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ ATLAS_2010_S8591806() : Analysis("ATLAS_2010_S8591806"), _Nevt_after_cuts(0.0) - { - setNeedsCrossSection(false); - } + { } void init() { Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -14,9 +14,7 @@ public: ATLAS_2010_S8817804() : Analysis("ATLAS_2010_S8817804") - { - setNeedsCrossSection(true); - } + { } private: Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -29,8 +29,6 @@ ATLAS_2010_S8914702() : Analysis("ATLAS_2010_S8914702") { - setNeedsCrossSection(true); - _eta_bins.push_back( 0.00); _eta_bins.push_back( 0.60); _eta_bins.push_back( 1.37); Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,9 +20,7 @@ /// Constructor ATLAS_2010_S8919674() : Analysis("ATLAS_2010_S8919674") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -22,11 +22,7 @@ ATLAS_2011_CONF_2011_090() : Analysis("ATLAS_2011_CONF_2011_090") - - { - /// Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_098.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -24,9 +24,7 @@ : Analysis("ATLAS_2011_CONF_2011_098"), //debug variables threeJA(0), threeJB(0), threeJC(0), threeJD(0), bj(0), jets(0), zerolept(0), eTmisscut(0) - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I919017.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I919017.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_I919017.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -67,9 +67,7 @@ _numjets06_15_19_04_06(0), _numjets06_15_19_06_10(0), _numjets06_15_19_10_15(0), _numjets06_15_19_15_24(0), _numjets06_15_19_24_40(0), _numjets04_00_19_04_06(0), _numjets04_00_19_06_10(0), _numjets04_00_19_10_15(0), _numjets04_00_19_15_24(0), _numjets04_00_19_24_40(0), _numjets06_00_19_04_06(0), _numjets06_00_19_06_10(0), _numjets06_00_19_10_15(0), _numjets06_00_19_15_24(0), _numjets06_00_19_24_40(0) - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,10 +18,7 @@ /// Constructor ATLAS_2011_S8971293() : Analysis("ATLAS_2011_S8971293") - { - /// Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -22,9 +22,7 @@ /// Constructor ATLAS_2011_S8983313() : Analysis("ATLAS_2011_S8983313") - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -22,11 +22,7 @@ ATLAS_2011_S9019561() : Analysis("ATLAS_2011_S9019561") - - { - /// Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9041966.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9041966.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9041966.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -36,10 +36,7 @@ mumuZCR(0), eeZCR(0), munuW2CR(0), munuttCR(0), enuW2CR(0), enuttCR(0) - { - /// Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -35,8 +35,6 @@ ATLAS_2011_S9120807() : Analysis("ATLAS_2011_S9120807") { - setNeedsCrossSection(true); - _eta_bins_areaoffset.push_back(0.0); _eta_bins_areaoffset.push_back(1.5); _eta_bins_areaoffset.push_back(3.0); Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9126244.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9126244.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9126244.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -52,9 +52,7 @@ /// Constructor ATLAS_2011_S9126244() : Analysis("ATLAS_2011_S9126244") - { - setNeedsCrossSection(false); - } + { } public: Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9128077.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9128077.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9128077.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,7 @@ /// Constructor ATLAS_2011_S9128077() : Analysis("ATLAS_2011_S9128077") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -11,26 +11,21 @@ /// @brief BELLE charmed mesons and baryons from fragmentation /// @author Eike von Seggern + /// @todo Apply BELLE hadron selection cuts class BELLE_2006_S6265367 : public Analysis { public: - BELLE_2006_S6265367(): Analysis("BELLE_2006_S6265367") - { - // setNeedsCrossSection(true); - } + BELLE_2006_S6265367() + : Analysis("BELLE_2006_S6265367") + { } void analyze(const Event& e) { - // - /// @todo Apply BELLE hadron selection cuts - // - const double weight = e.weight(); // Loop through unstable FS particles and look for charmed mesons/baryons const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS"); - /// @todo Implement sqrtS() for asymm. beams in beam projection const Beam beamproj = applyProjection<Beam>(e, "Beams"); const ParticlePair& beams = beamproj.beams(); FourMomentum mom_tot = beams.first.momentum() + beams.second.momentum(); @@ -42,7 +37,7 @@ // Particle masses from PDGlive (accessed online 16. Nov. 2009). foreach (const Particle& p, ufs.particles()) { - // TODO: Data is not corrected for branching fractions. + /// @todo Data is not corrected for branching fractions. double xp = 0.0; double mH2 = 0.0; Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,7 +15,6 @@ CDF_1988_S1865951() : Analysis("CDF_1988_S1865951") { - setNeedsCrossSection(true); _sumWTrig = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,7 @@ CDF_1993_S2742446() : Analysis("CDF_1993_S2742446") - { - setNeedsCrossSection(false); - } + { } public: Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_1996_S3108457() : Analysis("CDF_1996_S3108457") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_1998_S3618439() : Analysis("CDF_1998_S3618439") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -1,6 +1,4 @@ // -*- C++ -*- -// CDF Z pT analysis - #include "Rivet/Analysis.hh" #include "Rivet/RivetYODA.hh" #include "Rivet/Tools/Logging.hh" @@ -17,9 +15,7 @@ /// Constructor CDF_2000_S4155203() : Analysis("CDF_2000_S4155203") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_2000_S4266730() : Analysis("CDF_2000_S4266730") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -19,9 +19,7 @@ /// Constructor CDF_2001_S4517016() : Analysis("CDF_2001_S4517016") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_2001_S4563131() : Analysis("CDF_2001_S4563131") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -13,9 +13,9 @@ public: /// Constructor - CDF_2005_S6080774() : Analysis("CDF_2005_S6080774") { - setNeedsCrossSection(true); - } + CDF_2005_S6080774() + : Analysis("CDF_2005_S6080774") + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -13,9 +13,9 @@ public: /// Constructor - CDF_2006_S6450792() : Analysis("CDF_2006_S6450792") { - setNeedsCrossSection(true); - } + CDF_2006_S6450792() + : Analysis("CDF_2006_S6450792") + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -27,9 +27,7 @@ : Analysis("CDF_2006_S6653332"), _Rjet(0.7), _JetPtCut(20.), _JetEtaCut(1.5), _Lep1PtCut(18.), _Lep2PtCut(10.), _LepEtaCut(1.1), _sumWeightsWithZ(0.0), _sumWeightsWithZJet(0.0) - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -14,9 +14,7 @@ CDF_2007_S7057202() : Analysis("CDF_2007_S7057202") - { - setNeedsCrossSection(true); - } + { } void init() { Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -19,9 +19,7 @@ /// Constructor CDF_2008_S7540469() : Analysis("CDF_2008_S7540469") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -27,9 +27,7 @@ _eTmissCut(30.0*GeV), _mTCut(20.0*GeV), _jetEtCutA(20.0*GeV), _jetEtCutB(25.0*GeV), _jetETA(2.0), _xpoint(1960.) - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -1,6 +1,4 @@ // -*- C++ -*- -// CDF Run II inclusive jet cross-section using the midpoint algorithm. - #include "Rivet/Analysis.hh" #include "Rivet/RivetYODA.hh" #include "Rivet/Tools/Logging.hh" @@ -19,10 +17,9 @@ public: /// Constructor - CDF_2008_S7828950() : Analysis("CDF_2008_S7828950") - { - setNeedsCrossSection(true); - } + CDF_2008_S7828950() + : Analysis("CDF_2008_S7828950") + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ /// Constructor CDF_2008_S8093652() : Analysis("CDF_2008_S8093652") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,13 +17,7 @@ /// Constructor CDF_2009_NOTE_9936() : Analysis("CDF_2009_NOTE_9936") - //_sumWPassed(0.0) - { - /// @todo Set approriate for your analysis - - /// @todo Set whether your finalize method needs the generator cross section - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -29,9 +29,7 @@ CDF_2009_S8233977() : Analysis("CDF_2009_S8233977"), _sumWeightSelected(0.0) - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_2009_S8383952() : Analysis("CDF_2009_S8383952") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor CDF_2009_S8436959() : Analysis("CDF_2009_S8436959") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8884919.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8884919.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8884919.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -11,9 +11,10 @@ class CMS_2011_S8884919 : public Analysis { public: - CMS_2011_S8884919() : Analysis("CMS_2011_S8884919") { - setNeedsCrossSection(false); - } + CMS_2011_S8884919() + : Analysis("CMS_2011_S8884919") + { } + void init() { ChargedFinalState cfs(-2.4, 2.4, 0.0*GeV); Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,9 +20,7 @@ /// Constructor D0_1996_S3214044() : Analysis("D0_1996_S3214044") - { - setNeedsCrossSection(false); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,8 @@ //@{ /// Constructor - D0_1996_S3324664() : Analysis("D0_1996_S3324664") { - setNeedsCrossSection(false); - } + D0_1996_S3324664() : Analysis("D0_1996_S3324664") + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,7 @@ /// Constructor D0_2000_S4480767() : Analysis("D0_2000_S4480767") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,9 @@ //@{ /// Constructor. - D0_2001_S4674421() : Analysis("D0_2001_S4674421") { - setNeedsCrossSection(true); - } + D0_2001_S4674421() + : Analysis("D0_2001_S4674421") + { } /// @name Analysis methods @@ -77,7 +77,7 @@ if (inRange(mass/GeV, 75.0, 105.0)) { ++Zcount; _eventsFilledZ += weight; - //MSG_DEBUG("Z #" << Zcount << " pmom.pT() = " << pmom.pT()/GeV << " GeV"); + MSG_DEBUG("Z #" << Zcount << " pmom.pT() = " << pmom.pT()/GeV << " GeV"); _h_dsigdpt_z->fill(pmom.pT()/GeV, weight); } } else { Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,10 +20,9 @@ //@{ /// Default constructor. - D0_2006_S6438750() : Analysis("D0_2006_S6438750") - { - setNeedsCrossSection(true); - } + D0_2006_S6438750() + : Analysis("D0_2006_S6438750") + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -23,9 +23,7 @@ /// Constructor D0_2008_S7662670() : Analysis("D0_2008_S7662670") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,7 +18,6 @@ /// @author Andy Buckley /// @author Gavin Hesketh class D0_2008_S7719523 : public Analysis { - public: /// @name Constructors etc. @@ -27,9 +26,7 @@ /// Constructor D0_2008_S7719523() : Analysis("D0_2008_S7719523") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -16,10 +16,9 @@ /// @name Construction //@{ /// Constructor - D0_2008_S7863608() : Analysis("D0_2008_S7863608") - { - setNeedsCrossSection(true); - } + D0_2008_S7863608() + : Analysis("D0_2008_S7863608") + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -19,9 +19,7 @@ /// Constructor D0_2009_S8349509() : Analysis("D0_2009_S8349509"), _inclusive_Z_sumofweights(0.0) - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -19,9 +19,7 @@ /// Constructor D0_2010_S8566488() : Analysis("D0_2010_S8566488") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,9 +20,7 @@ D0_2010_S8570965() : Analysis("D0_2010_S8570965") - { - setNeedsCrossSection(true); - } + { } public: Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,9 +18,7 @@ /// Constructor D0_2010_S8671338() : Analysis("D0_2010_S8671338") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,9 +20,7 @@ /// Constructor D0_2010_S8821313() : Analysis("D0_2010_S8821313") - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -18,10 +18,7 @@ LHCB_2010_S8758301() : Analysis("LHCB_2010_S8758301"), sumKs0_30(0.0), sumKs0_35(0.0), sumKs0_40(0.0) - - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -13,9 +13,9 @@ public: /// Constructor - MC_DIPHOTON() : Analysis("MC_DIPHOTON") { - setNeedsCrossSection(true); - } + MC_DIPHOTON() + : Analysis("MC_DIPHOTON") + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ /// Default constructor MC_HJETS() : MC_JetAnalysis("MC_HJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_JETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_JETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_JETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -12,10 +12,9 @@ class MC_JETS : public MC_JetAnalysis { public: - MC_JETS() : MC_JetAnalysis("MC_JETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + MC_JETS() + : MC_JetAnalysis("MC_JETS", 4, "Jets") + { } public: Modified: branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,7 +17,7 @@ _h_rap_jet(njet), _h_rap_jet_plus(njet), _h_rap_jet_minus(njet), _h_mass_jet(njet) { - setNeedsCrossSection(true); + setNeedsCrossSection(true); // legitimate use, since a base class has no .info file! } Modified: branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ /// Default constructor MC_PHOTONJETS() : MC_JetAnalysis("MC_PHOTONJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_VH2BB.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_VH2BB.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_VH2BB.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -25,9 +25,7 @@ /// Constructor MC_VH2BB() : Analysis("MC_VH2BB") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -16,9 +16,7 @@ /// Default constructor MC_WJETS() : MC_JetAnalysis("MC_WJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -20,9 +20,7 @@ /// Constructor MC_WPOL() : Analysis("MC_WPOL") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -9,6 +9,7 @@ namespace Rivet { + /// @brief MC validation analysis for W^+[enu]W^-[munu] + jets events class MC_WWJETS : public MC_JetAnalysis { public: @@ -16,9 +17,7 @@ /// Default constructor MC_WWJETS() : MC_JetAnalysis("MC_WWJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -17,9 +17,7 @@ /// Constructor MC_XS() : Analysis("MC_XS") - { - setNeedsCrossSection(true); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ /// Default constructor MC_ZJETS() : MC_JetAnalysis("MC_ZJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -16,9 +16,7 @@ /// Default constructor MC_ZZJETS() : MC_JetAnalysis("MC_ZZJETS", 4, "Jets") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -7,6 +7,7 @@ namespace Rivet { + namespace { /// @name Jet angle calculator functions @@ -68,9 +69,7 @@ /// Constructor OPAL_2001_S4553896() : Analysis("OPAL_2001_S4553896") - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,9 +15,7 @@ /// Constructor STAR_2006_S6870392() : Analysis("STAR_2006_S6870392") - { - setNeedsCrossSection(true); - } + { } /// @name Analysis methods Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -50,9 +50,7 @@ : Analysis("STAR_2008_S7869363"), nCutsPassed(0), nPi(0), nPiPlus(0), nKaon(0), nKaonPlus(0), nProton(0), nAntiProton(0) - { - setNeedsCrossSection(false); - } + { } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -15,7 +15,6 @@ /// Constructor UA1_1990_S2044935() : Analysis("UA1_1990_S2044935") { - setNeedsCrossSection(true); _sumwTrig = 0; _sumwTrig08 = 0; _sumwTrig40 = 0; Modified: branches/2011-07-aida2yoda/src/Core/AnalysisInfo.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Core/AnalysisInfo.cc Thu Oct 6 21:48:38 2011 (r3419) +++ branches/2011-07-aida2yoda/src/Core/AnalysisInfo.cc Thu Oct 6 21:57:04 2011 (r3420) @@ -134,7 +134,7 @@ *todo >> s; ai->_todos += s; } - } else if (key == "NeedCrossSection") { + } else if (key == "NeedCrossSection" || key == "NeedsCrossSection") { it.second() >> ai->_needsCrossSection; } else if (key == "RunInfo") { it.second() >> ai->_runInfo;
More information about the Rivet-svn mailing list |