pyInterface: fix pylint errors

Fix pylint errors for version 1.7.1: * Do not use `len(SEQUENCE)` as condition value * Unnecessary "else" after "return" Version 1.7.1 cannot yet be made the default for Travis, as this version cannot handle the way we install out Python module using symbolic links (pylint-dev/pylint#1470).
ROOTPWA-Maintainers · Jul 13, 2017 · 1394fd6 · 1394fd6
1 parent 345a2e8
commit 1394fd6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/pyInterface/scripts/calcAmplitudes.py b/pyInterface/scripts/calcAmplitudes.py
@@ -53,7 +53,7 @@
 			sys.exit(1)
 		waveList = [allWaveNames[args.keyfileIndex]]
 		pyRootPwa.utils.printInfo("using keyfile index " + str(args.keyfileIndex) + " resulting in the wave name '" + waveList[0] + "'.")
-	if len(waveList) == 0:
+	if not waveList:
 		waveList = fileManager.getWaveNameList()
 
 	eventsTypes = []

diff --git a/pyInterface/scripts/convertTreeToEvt.py b/pyInterface/scripts/convertTreeToEvt.py
@@ -9,23 +9,23 @@
 import pyRootPwa.core
 
 def writeParticleToFile (outFile, particleName, particleMomentum):
-	if pyRootPwa.core.particleDataTable.isInTable(particleName):
-		partProperties = pyRootPwa.core.particleDataTable.entry(particleName)
-		charge = partProperties.charge
-		energy = math.sqrt(particleMomentum.Px()**2 + particleMomentum.Py()**2 + particleMomentum.Pz()**2 + partProperties.mass2)
-		outFile.write(
-		                    str(pyRootPwa.core.particleDataTable.geantIdFromParticleName(particleName)) + " " +
-		                    str(charge) + " " +
-		                    '%.16e' % particleMomentum.Px() + " " +
-		                    '%.16e' % particleMomentum.Py() + " " +
-		                    '%.16e' % particleMomentum.Pz() + " " +
-		                    '%.16e' % energy + "\n"
-		                   )
-		return True
-	else:
+	if not pyRootPwa.core.particleDataTable.isInTable(particleName):
 		pyRootPwa.utils.printErr("particle '" + particleName + "' not found in particleDataTable.")
 		return False
 
+	partProperties = pyRootPwa.core.particleDataTable.entry(particleName)
+	charge = partProperties.charge
+	energy = math.sqrt(particleMomentum.Px()**2 + particleMomentum.Py()**2 + particleMomentum.Pz()**2 + partProperties.mass2)
+	outFile.write(
+	                    str(pyRootPwa.core.particleDataTable.geantIdFromParticleName(particleName)) + " " +
+	                    str(charge) + " " +
+	                    '%.16e' % particleMomentum.Px() + " " +
+	                    '%.16e' % particleMomentum.Py() + " " +
+	                    '%.16e' % particleMomentum.Pz() + " " +
+	                    '%.16e' % energy + "\n"
+	                   )
+	return True
+
 if __name__ == "__main__":
 
 	parser = argparse.ArgumentParser(

diff --git a/pyInterface/scripts/plotAngles.py b/pyInterface/scripts/plotAngles.py
@@ -130,7 +130,7 @@ def getPermutationsForIsobarCombinations(topology, isobarCombinations):
 	parser.add_argument("--disable-bose-symmetrization", action="store_true", dest="disableBoseSymmetrization", help="do not consider Bose-symmetric permutations")
 	parser.add_argument("--weight-file", type=str, metavar="weightFile", dest="weightFile", help="weightFile")
 	arguments = parser.parse_args()
-	if len(arguments.massBins) == 0:
+	if not arguments.massBins:
 		arguments.massBins.append("all")
 
 	if arguments.type not in ["data", "acc", "gen"]: