[Rivet-svn] r4204 - in trunk: . bin doc include/Rivet

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Mar  7 09:57:16 2013
New Revision: 4204

Log:
Removing defunct scripts that have been replaced/obsoleted by YODA.

Deleted:
   trunk/bin/aida2flat
   trunk/bin/compare-histos
   trunk/bin/flat2aida
   trunk/bin/rivet-chopbins
   trunk/bin/rivet-rmgaps
Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/rivet-merge-CDF_2012_NOTE10874
   trunk/doc/Makefile.am
   trunk/include/Rivet/Particle.hh

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Mar  6 17:42:51 2013	(r4203)
+++ trunk/ChangeLog	Thu Mar  7 09:57:16 2013	(r4204)
@@ -1,3 +1,7 @@
+2013-03-07  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Removing defunct scripts that have been replaced/obsoleted by YODA.
+
 2013-03-06  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Fixing doc build so that the reference histos and titles are

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	Wed Mar  6 17:42:51 2013	(r4203)
+++ trunk/bin/Makefile.am	Thu Mar  7 09:57:16 2013	(r4204)
@@ -1,17 +1,12 @@
 bin_SCRIPTS = rivet-config
-
-dist_bin_SCRIPTS = \
-	aida2flat aida2root flat2aida root2flat \
-	compare-histos make-plots
+dist_bin_SCRIPTS = aida2root root2flat make-plots
 EXTRA_DIST =
 
 RIVETPROGS = \
     rivet \
-    rivet-mkanalysis rivet-buildplugin \
-    rivet-chopbins rivet-cmphistos rivet-rmgaps rivet-rescale \
-    rivet-mergeruns rivet-mkhtml rivet-findid \
-    rivet-merge-CDF_2012_NOTE10874
-
+    rivet-mkanalysis rivet-buildplugin rivet-findid \
+    rivet-cmphistos rivet-mkhtml
+    # TODO: reinstate  rivet-rescale rivet-mergeruns rivet-merge-CDF_2012_NOTE10874
 if ENABLE_PYEXT
 dist_bin_SCRIPTS += $(RIVETPROGS)
 else

Modified: trunk/bin/rivet-merge-CDF_2012_NOTE10874
==============================================================================
--- trunk/bin/rivet-merge-CDF_2012_NOTE10874	Wed Mar  6 17:42:51 2013	(r4203)
+++ trunk/bin/rivet-merge-CDF_2012_NOTE10874	Thu Mar  7 09:57:16 2013	(r4204)
@@ -33,10 +33,10 @@
 
 
 def CreateHistoList(histolist1, histolist2, EnergyRatioIndex):
-    newHistoList = []     
+    newHistoList = []
     for m in range(3):
 	histo1= histolist1[m]
-	histo2= histolist2[m]	
+	histo2= histolist2[m]
 	VarIndex = m+1
 	histo3 = newHisto(histo1, histo2, VarIndex, EnergyRatioIndex)
 	newHistoList.append(histo3)
@@ -45,7 +45,7 @@
 
 def newHisto(h1, h2, vIndex, eIndex):
     h3 = Histo()
-    for binNum1, bin1 in enumerate(h1.getBins()): #getBins ensures bins are sorted 
+    for binNum1, bin1 in enumerate(h1.getBins()): #getBins ensures bins are sorted
 	for binNum2, bin2 in enumerate(h2.getBins()):
 	    if (binNum1 == binNum2) and (bin1.xlow == bin2.xlow) and (bin2.xhigh == bin2.xhigh):
 	        ratio = bin1.val / bin2.val
@@ -53,7 +53,7 @@
 		err = FindError(bin1.val, bin2.val, bin1.getErr(), bin2.getErr() )
 		newBin.setErr(err)
 	    	h3.addBin(newBin)
-		
+
 
     h3.name = "d0%d-x01-y0%d"%(vIndex, eIndex)
     h3.path = "/CDF_2012_NOTE10874/"
@@ -72,7 +72,7 @@
     plotparser = PlotParser() #will this work? Check.
 
     histos = {}
-    
+
     from optparse import OptionParser
     parser = OptionParser(usage=__doc__)
     opts, aidafiles = parser.parse_args()
@@ -80,7 +80,7 @@
     keys = ['300', '900', '1960']
 
     for counter in range(3):
-	aidafile = aidafiles[counter]	
+	aidafile = aidafiles[counter]
 	try:
 	    tree = ET.parse(aidafile)
         except:
@@ -88,7 +88,7 @@
             sys.exit(1)
         for dps in tree.findall("dataPointSet"):
             useThis = True
-            
+
             ## Check dataPointSet contains at least one measurement
             try:
                 if dps.find('dataPoint').find('measurement') is None:
@@ -96,7 +96,7 @@
             except AttributeError, err:
                 logging.debug(err)
 
-            
+
             if useThis:
                 hist = Histo.fromDPS(dps)
                 try:
@@ -108,7 +108,7 @@
 
     for energy, hs in histos.items():
 	sorted(hs, key=lambda hist: hist.name)
-    
+
     MyNewHistoList = CreateHistoList(histos['1960'], histos['300'], 4)
     MyNewHistoList += CreateHistoList(histos['900'], histos['300'], 5)
     MyNewHistoList += CreateHistoList(histos['1960'], histos['900'], 6)
@@ -120,7 +120,3 @@
     out.close()
 
     print ("Successfully created new file %s" % outfile)
-
-#####################################################################
-
-

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	Wed Mar  6 17:42:51 2013	(r4203)
+++ trunk/doc/Makefile.am	Thu Mar  7 09:57:16 2013	(r4204)
@@ -8,8 +8,7 @@
   make-plots.txt rivet-manual.tex $(LATEXSUBSOURCES) hepparticles.sty maybemath.sty \
   rivet-manual.pdf hepunits.sty underscore.sty microtype.sty
 
-## TODO: replace readplot with lighthisto/YODA functionality
-EXTRA_DIST = $(DOCSOURCES) readplot.py
+EXTRA_DIST = $(DOCSOURCES)
 
 if WITH_ASCIIDOC
 EXTRA_DIST += compare-histos.html make-plots.html

Modified: trunk/include/Rivet/Particle.hh
==============================================================================
--- trunk/include/Rivet/Particle.hh	Wed Mar  6 17:42:51 2013	(r4203)
+++ trunk/include/Rivet/Particle.hh	Thu Mar  7 09:57:16 2013	(r4204)
@@ -104,6 +104,9 @@
 
     /// The momentum of this projection of the Particle.
     FourMomentum _momentum;
+
+    /// @todo Also store production and decay positions and make them available.
+
   };