gistfile1.diff

index 4633fbc..9957ca7 100644
--- a/data2012dev/take_qcdkiller_hcalDeadEcal.py
+++ b/data2012dev/take_qcdkiller_hcalDeadEcal.py
@@ -1,5 +1,21 @@
+import math as ma
 from inputData import data, quadSum, fb

+def newSystMag(oldmag = None, ttw = None, zinv = None):
+    # get abs errs
+    ttwsyst = float(oldmag * ttw)
+    zinvsyst = float(1. * zinv)
+
+    # combine to determine new total abs err
+    newabs = ma.sqrt( ma.pow(ttwsyst, 2) + ma.pow(zinvsyst, 2) )
+
+    try:
+        # return new relative error
+        return float(newabs / (ttw + zinv))
+    except ZeroDivisionError:
+        return 0.
+
+
 def common1(x) :

     x._lumi =   {
@@ -65,6 +81,43 @@ def common(x) :
         systBins = tuple([0]*1 + [1]*1 + [2]*1 + [3]*2 + [4]*2 + [5]*2)# + [6]*2)
         systMagnitudes = systMagnitudes[:-1]

+        if "2b" in name:
+            # systMagnitudes = (1.,)*len(systMagnitudes)
+            newSysts = ()
+
+            #200
+            newSysts += (newSystMag(systMagnitudes[0],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][0],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][0]),)
+
+            #275
+            newSysts += (newSystMag(systMagnitudes[1],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][1],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][1]),)
+
+            #325
+            newSysts += (newSystMag(systMagnitudes[2],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][2],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][2]),)
+
+            # 375+475
+            newSysts += (newSystMag(systMagnitudes[3],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][3] + x._mcExpectationsBeforeTrigger['mcTtw'][4],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][3] + x._mcExpectationsBeforeTrigger['mcZinv'][4]),)
+
+            # 575+675
+            newSysts += (newSystMag(systMagnitudes[4],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][5] + x._mcExpectationsBeforeTrigger['mcTtw'][6],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][5] + x._mcExpectationsBeforeTrigger['mcZinv'][6]),)
+
+            # 775+875
+            newSysts += (newSystMag(systMagnitudes[5],
+                                    x._mcExpectationsBeforeTrigger['mcTtw'][7] + x._mcExpectationsBeforeTrigger['mcTtw'][8],
+                                    x._mcExpectationsBeforeTrigger['mcZinv'][7] + x._mcExpectationsBeforeTrigger['mcZinv'][8]),)
+            assert len(systMagnitudes) == len(newSysts), "Syst mag err"
+            systMagnitudes = newSysts
+            systMagnitudes = (1.,)*len(systMagnitudes) #100% hack
+
     else :
         x._mergeBins = None