ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/RateMonShiftTool_dev/AddTableInfo_db.py

Comparing UserCode/RateMonShiftTool_dev/AddTableInfo_db.py (file contents):
Revision 1.28 by amott, Thu May 10 14:27:53 2012 UTC vs.
Revision 1.31 by grchrist, Mon Jul 2 12:32:14 2012 UTC

#	Line 32 | Line 32 | def MoreTableInfo(parser,LumiRange,confi
32		else:
33		realARates={}
34		for k,v in bRates.iteritems():
35	<	realARates[k]=aRates[k]-bRates[k]
35	>	realARates[k]=aRates[k]-bRates[k]*20
36		#realARates = aRates - bRates*20;
37		else:
38		if len(parser.GetTriggerRatesByLS("AOutput"))>0:
39		aRates = parser.GetTriggerRatesByLS("AOutput")
40	+	bRates = parser.GetTriggerRatesByLS("BOutput")
41		else:
42		aRates = parser.GetTriggerRatesByLS("AForPPOutput")
43	+	bRates = parser.GetTriggerRatesByLS("BForPPOutput")
44
45
46		expressRates = {}
#	Line 75 | Line 77 | def MoreTableInfo(parser,LumiRange,confi
77		if thisRateA>PeakRateA:
78		PeakRateA=thisRateA
79
80	<	thisRealRateA = aRates.get(ls,0) - bRates.get(ls,0)
80	>	thisRealRateA = aRates.get(ls,0) - bRates.get(ls,0)*20
81		realARate+=thisRealRateA
82		if thisRealRateA > realPeakRateA:
83		realReakRateA = thisRealRateA
#	Line 86 | Line 88 | def MoreTableInfo(parser,LumiRange,confi
88		Warn = False
89
90		##########################################
91	<	## Check if the express stream is too high
91	>	## Check if the express stream is too high or low
92		##########################################
93		global NHighExpress
94	<	badExpress = ExpRate/len(LumiRange) > config.MaxExpressRate ## avg express stream rate too high?
94	>	badExpress = ((ExpRate/len(LumiRange) > config.MaxExpressRate) or ExpRate<0.1) ## avg express stream rate too high?
95		baseText = "\nCurrent Express Stream rate is: %0.1f Hz" % (ExpRate/len(LumiRange),) ## text to display
96		if badExpress:
97		text = colored(baseText,'red',attrs=['reverse'])  ## bad, make the text white on red

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines