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.27 by amott, Thu May 3 15:31:09 2012 UTC vs.
Revision 1.33 by grchrist, Mon Jul 2 12:52:29 2012 UTC

#	Line 26 | Line 26 | def MoreTableInfo(parser,LumiRange,confi
26		if isCol:
27
28		aRates = parser.GetTriggerRatesByLS("AOutput")
29	+	bRates = parser.GetTriggerRatesByLS("BOutput")
30	+	if len(bRates) == 0:
31	+	realARates = aRates
32	+	else:
33	+	realARates={}
34	+	for k,v in bRates.iteritems():
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 49 | Line 59 | def MoreTableInfo(parser,LumiRange,confi
59		PeakRateA=0
60		AvgRateA=0
61
62	+	realARate=0
63	+	realPeakRateA=0
64	+	realAvgRateA=0
65	+
66		if len(expressRates.values()) > 20:
67		AvgExpRate = sum(expressRates.values())/len(expressRates.values())
68
#	Line 62 | Line 76 | def MoreTableInfo(parser,LumiRange,confi
76		ARate+=thisRateA
77		if thisRateA>PeakRateA:
78		PeakRateA=thisRateA
79	<
79	>
80	>	thisRealRateA = aRates.get(ls,0) - bRates.get(ls,0)*20
81	>	realARate+=thisRealRateA
82	>	if thisRealRateA > realPeakRateA:
83	>	realReakRateA = thisRealRateA
84		#ARate+=aRates.get(ls,0)
85		## Print Stream A Rate --moved see below
86		##print "Current Steam A Rate is: %0.1f Hz" % (ARate/len(LumiRange),)
#	Line 70 | 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/len(LumiRange)<0.1 and isCol)) ## 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
#	Line 103 | Line 121 | def MoreTableInfo(parser,LumiRange,confi
121		##Check if Stream A is too high
122		#########################################
123		global NHighStreamA
124	<	badStreamA =ARate/len(LumiRange) > config.MaxStreamARate ##Cosmics Express Rate 300 Hz max
124	>	badStreamA =realARate/len(LumiRange) > config.MaxStreamARate ##Cosmics Express Rate 300 Hz max
125		baseTextA= "\nCurrent Steam A Rate is: %0.1f Hz" % (ARate/len(LumiRange),)
126	+	baseTextRealA= "\nCurrent PROMPT Steam A Rate is: %0.1f Hz" % (realARate/len(LumiRange),)
127		if badStreamA:
128		textA=colored(baseTextA,'red',attrs=['reverse'])  ## bad, make the text white on red
129	+	textRealA=colored(baseTextRealA,'red',attrs=['reverse'])  ## bad, make the text white on red
130		NHighStreamA+=1
131		else:
132		textA=baseTextA
133	+	textRealA=baseTextRealA
134		NHighStreamA=0
135
136		write(textA)
137	+	write(textRealA)
138		if badStreamA:
139		if len(LumiRange)>1:
140	<	if (ARate-PeakRateA)/(len(LumiRange)-1) <=config.MaxStreamARate: ## one lumisection causes this
140	>	if (realARate-realPeakRateA)/(len(LumiRange)-1) <=config.MaxStreamARate: ## one lumisection causes this
141		write("  <<  This appears to be due to a 1 lumisection spike, please monitor\n")
142		else:
143		if NHighStreamA >1: ##Call HLT doc!

Diff Legend

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