ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/RateMonShiftTool_dev/AddTableInfo_db.py
(Generate patch)

Comparing UserCode/RateMonShiftTool_dev/AddTableInfo_db.py (file contents):
Revision 1.22 by grchrist, Thu Apr 5 06:13:40 2012 UTC vs.
Revision 1.27 by amott, Thu May 3 15:31:09 2012 UTC

# Line 9 | Line 9 | NHighStreamA=0
9  
10   def MoreTableInfo(parser,LumiRange,config,isCol=True):
11      print "Monitoring Run %d" % (parser.RunNumber,)
12 <    [AvInstLumi, AvLiveLumi, AvDeliveredLumi, AvDeadTime,PSCols] = parser.GetAvLumiInfo(LumiRange)
13 <    deadtimebeamactive=parser.GetDeadTimeBeamActive(LumiRange)
12 >    print "len=",len(LumiRange)
13 >    print "LSRange=", LumiRange
14 >    if len(LumiRange)>0:
15 >        
16 >        [AvInstLumi, AvLiveLumi, AvDeliveredLumi, AvDeadTime,PSCols] = parser.GetAvLumiInfo(LumiRange)
17 >        deadtimebeamactive=parser.GetDeadTimeBeamActive(LumiRange)*100
18 >        ##print "dtba=",deadtimebeamactive
19 >    else:
20 >        print "no lumisections to monitor"
21 >        return
22      try:
23          LastPSCol = PSCols[-1]
24      except:
# Line 149 | Line 157 | def MoreTableInfo(parser,LumiRange,confi
157              write(bcolors.OKBLUE)
158          write(str(round(deadtimebeamactive,2))+"%")
159          write(bcolors.ENDC+"\n")
160 <
161 <    print "Used prescale column(s): "+str(PrescaleColumnString)    
162 <    write("Lumisections: ")
160 >    write("Used prescale column(s): %s  " % (str(PrescaleColumnString),) )
161 >    if LastPSCol in config.ForbiddenCols and isCol:
162 >        write( colored("<< Using column %d! Please check in the documentation that this is the correct column" % (LastPSCol),'red',attrs=['reverse']) )
163 >    write("\nLumisections: ")
164      if not isSequential(LumiRange):
165          write(str(LumiRange)+"   Lumisections are not sequential (bad LS skipped)\n")
166      else:
167          write("%d - %d\n" % (min(LumiRange),max(LumiRange),))
168 <    print "\nLast Lumisection of the run is:        "+str(parser.GetLastLS())
169 <    write(  "Last Lumisection good where DAQ is active is:  "+str(parser.GetLastLS(isCol)) )
168 >    ##print "\nLast Lumisection of the run is:        "+str(parser.GetLastLS())
169 >    write(  "\nLast Lumisection good where DAQ is active is:  "+str(parser.GetLastLS(isCol)) )
170      ##write(  "Last Lumisection where DAQ is active is:  "+str(parser.GetLastLS(True)) )
171      write("\n\n\n")
172  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines