--- a/scripts/display-trajectories.py	Wed May 28 17:46:38 2014 -0400
+++ b/scripts/display-trajectories.py	Mon Jun 02 17:46:49 2014 -0400
@@ -38,21 +38,24 @@
 else:
     homography = None
     undistort = False
-    
+    intrinsicCameraMatrix = None
+    distortionCoefficients = []
+    undistortedImageMultiplication = None
+    firstFrameNum = 0
 
-if not args.configFilename or args.videoFilename != None:
+if not args.configFilename and args.videoFilename != None:
     videoFilename = args.videoFilename
-if not args.configFilename or args.databaseFilename != None:
+if not args.configFilename and args.databaseFilename != None:
     databaseFilename = args.databaseFilename
-if not args.configFilename or args.homographyFilename != None:
+if not args.configFilename and args.homographyFilename != None:
     homography = inv(loadtxt(args.homographyFilename))            
-if not args.configFilename or args.intrinsicCameraMatrixFilename != None:
+if not args.configFilename and args.intrinsicCameraMatrixFilename != None:
     intrinsicCameraMatrix = loadtxt(args.intrinsicCameraMatrixFilename)
-if not args.configFilename or args.distortionCoefficients != None:
+if not args.configFilename and args.distortionCoefficients != None:
     distortionCoefficients = args.distortionCoefficients
-if not args.configFilename or args.undistortedImageMultiplication != None:
+if not args.configFilename and args.undistortedImageMultiplication != None:
     undistortedImageMultiplication = args.undistortedImageMultiplication
-if not args.configFilename or args.firstFrameNum != None:
+if not args.configFilename and args.firstFrameNum != None:
     firstFrameNum = args.firstFrameNum