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.17 by grchrist, Mon Mar 26 15:50:19 2012 UTC vs.
Revision 1.19 by grchrist, Thu Apr 5 05:03:24 2012 UTC

#	Line 15 | Line 15 | def MoreTableInfo(parser,LumiRange,confi
15		LastPSCol = PSCols[-1]
16		except:
17		LastPSCol = -1
18	+	if isCol:
19
20	<	aRates = parser.GetTriggerRatesByLS("AOutput")
20	>	aRates = parser.GetTriggerRatesByLS("AOutput")
21	>	else:
22	>	if len(parser.GetTriggerRatesByLS("AOutput"))>0:
23	>	aRates = parser.GetTriggerRatesByLS("AOutput")
24	>	else:
25	>	aRates = parser.GetTriggerRatesByLS("AForPPOutput")
26	>
27	>
28		expressRates = {}
29		if isCol:
30		expressRates = parser.GetTriggerRatesByLS("ExpressOutput")
31		else:
32	<	expressRates = parser.GetTriggerRatesByLS("ExpressCosmicsOutput")
32	>	if len(parser.GetTriggerRatesByLS("ExpressOutput"))>0:
33	>	expressRates=parser.GetTriggerRatesByLS("ExpressOutput")
34	>	else:
35	>	expressRates = parser.GetTriggerRatesByLS("ExpressForCosmicsOutput")
36		ExpRate=0
37		PeakRate=0
38		AvgExpRate=0
#	Line 143 | Line 154 | def MoreTableInfo(parser,LumiRange,confi
154		else:
155		write("%d - %d\n" % (min(LumiRange),max(LumiRange),))
156		print "\nLast Lumisection of the run is:        "+str(parser.GetLastLS())
157	<	write(  "Last Lumisection good for physics is:  "+str(parser.GetLastLS(True)) )
157	>	write(  "Last Lumisection good where DAQ is active is:  "+str(parser.GetLastLS(isCol)) )
158	>	##write(  "Last Lumisection where DAQ is active is:  "+str(parser.GetLastLS(True)) )
159		write("\n\n\n")
160
161		if isCol:

Diff Legend

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