Skip to content

Commit

Permalink
Use perferred form of not-equal since python 3 eliminates <>
Browse files Browse the repository at this point in the history
  • Loading branch information
ericvaandering committed Oct 19, 2015
1 parent afee369 commit 931a199
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@

# Set collector host to machine where gui output to be collected
process.DQM.collectorHost = 'lxplus305'
if (host<>None):
if (host!=None):
process.DQM.collectorHost = host
process.DQM.collectorPort = 9190
process.dqmSaver.convention = 'Online'
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalMonitorTasks/python/HcalMonitorTasks_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def SetTaskParams(process,param, value):
# Tries to set all task parameter 'param' to the value 'value'
newval=value
isstring=False
if (newval<>True and newval<>False):
if (newval!=True and newval!=False):
try:
newval=string.atoi(newval)
except:
Expand Down
4 changes: 2 additions & 2 deletions EventFilter/HcalRawToDigi/test/GetBadEvents.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ def GetBadCrabEvents(crabdir=None,prefix=None,verbose=False):
###print f
temp=open(os.path.join(newdir,f),'r').readlines()
for line in temp:
if prefix<>None and not line.startswith(prefix):
if prefix!=None and not line.startswith(prefix):
continue
if prefix<>None:
if prefix!=None:
thisline=string.strip(string.split(line,prefix)[1])
else:
thisline=string.strip(line)
Expand Down
14 changes: 7 additions & 7 deletions FWCore/ParameterSet/python/Types.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def __init__(self, start, startSub=None, end=None, endSub=None):
if self.__end < self.__start:
raise RuntimeError('LuminosityBlockRange '+str(self.__start)+':'+str(self.__startSub)+'-'+str(self.__end)+':'+str(self.__endSub)+' out of order')
# 0 luminosity block number is a special case that means no limit
if self.__end == self.__start and (self.__endSub <> 0 and self.__endSub < self.__startSub):
if self.__end == self.__start and (self.__endSub != 0 and self.__endSub < self.__startSub):
raise RuntimeError('LuminosityBlockRange '+str(self.__start)+':'+str(self.__startSub)+'-'+str(self.__end)+':'+str(self.__endSub)+' out of order')
def start(self):
return self.__start
Expand Down Expand Up @@ -340,7 +340,7 @@ def __init__(self, start, *args):
if self.__end < self.__start or (self.__end == self.__start and self.__endLumi < self.__startLumi):
raise RuntimeError('EventRange '+str(self.__start)+':'+str(self.__startLumi)+':'+str(self.__startSub)+'-'+str(self.__end)+':'+str(self.__endLumi)+':'+str(self.__endSub)+' out of order')
# 0 event number is a special case that means no limit
if self.__end == self.__start and self.__endLumi == self.__startLumi and (self.__endSub <> 0 and self.__endSub < self.__startSub):
if self.__end == self.__start and self.__endLumi == self.__startLumi and (self.__endSub != 0 and self.__endSub < self.__startSub):
raise RuntimeError('EventRange '+str(self.__start)+':'+str(self.__startLumi)+':'+str(self.__startSub)+'-'+str(self.__end)+':'+str(self.__endLumi)+':'+str(self.__endSub)+' out of order')
def start(self):
return self.__start
Expand Down Expand Up @@ -462,11 +462,11 @@ def pythonValue(self, options=PrintOptions()):
def _isValid(value):
return True
def __cmp__(self,other):
v = self.__moduleLabel <> other.__moduleLabel
v = self.__moduleLabel != other.__moduleLabel
if not v:
v= self.__productInstance <> other.__productInstance
v= self.__productInstance != other.__productInstance
if not v:
v=self.__processName <> other.__processName
v=self.__processName != other.__processName
return v
def value(self):
"Return the string rep"
Expand Down Expand Up @@ -538,9 +538,9 @@ def pythonValue(self, options=PrintOptions()):
def _isValid(value):
return True
def __cmp__(self,other):
v = self.__moduleLabel <> other.__moduleLabel
v = self.__moduleLabel != other.__moduleLabel
if not v:
v= self.__data <> other.__data
v= self.__data != other.__data
return v
def value(self):
"Return the string rep"
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalCalo/HcalRecAlgos/test/test_RecHitReflagger_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
severitylevels.append(process.hcalRecAlgos.SeverityLevels[i].Level.value()) # store severity value
flagvec=process.hcalRecAlgos.SeverityLevels[i].RecHitFlags.value() # Get vector of rechit flags for this severity level
flaglevel=process.hcalRecAlgos.SeverityLevels[i].Level.value()
if "UserDefinedBit0" in flagvec and flaglevel<>10: # remove HFLongShort from its default position
if "UserDefinedBit0" in flagvec and flaglevel!=10: # remove HFLongShort from its default position
flagvec.remove("UserDefinedBit0")
process.hcalRecAlgos.SeverityLevels[i].RecHitFlags=flagvec
print "Removed 'UserDefinedBit0' from severity level %i"%(process.hcalRecAlgos.SeverityLevels[i].Level.value())
if (flaglevel==NewSevLevel): # Set UserDefinedBit0 severity to 10, which will exclude such rechits from CaloTower
print "FOUND LEVEL %i!"%NewSevLevel
if "UserDefinedBit0" not in flagvec:
if (flagvec<>['']):
if (flagvec!=['']):
flagvec.append("UserDefinedBit0")
else:
flagvec=["UserDefinedBit0"]
Expand Down
2 changes: 1 addition & 1 deletion Validation/EcalClusters/test/macro/plotEffSigmaVsET.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

for i in ("emCorr_et", "em_et"):
for j in range(0, len(eta1)):
if variable[j] <> i:
if variable[j] != i:
continue
bin = str(int((float(eta1[j]) + float(eta2[j]))/2))
file.write(" h_" + i + "->SetBinContent(" + bin + ", " + effS[j] + ");\n")
Expand Down
2 changes: 1 addition & 1 deletion Validation/EcalClusters/test/macro/plotEffSigmaVsEta.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

for i in ("emCorr_et", "em_et"):
for j in range(0, len(eta1)):
if variable[j] <> i:
if variable[j] != i:
continue
bin = str(int((float(eta1[j]) + float(eta2[j]))*50))
file.write(" h_" + i + "->SetBinContent(" + bin + ", " + effS[j] + ");\n")
Expand Down
2 changes: 1 addition & 1 deletion Validation/EcalClusters/test/macro/plotMeanVsET.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

for i in ("emCorr_et", "em_et"):
for j in range(0, len(eta1)):
if variable[j] <> i:
if variable[j] != i:
continue
bin = str(int((float(eta1[j]) + float(eta2[j]))/2))
file.write(" h_" + i + "->SetBinContent(" + bin + ", " + mean[j] + ");\n")
Expand Down
2 changes: 1 addition & 1 deletion Validation/EcalClusters/test/macro/plotMeanVsEta.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

for i in ("emCorr_et", "em_et"):
for j in range(0, len(eta1)):
if variable[j] <> i:
if variable[j] != i:
continue
bin = str(int((float(eta1[j]) + float(eta2[j]))*50))
file.write(" h_" + i + "->SetBinContent(" + bin + ", " + mean[j] + ");\n")
Expand Down

0 comments on commit 931a199

Please sign in to comment.