--- a/trafficintelligence/storage.py	Fri Jul 06 18:42:58 2018 -0400
+++ b/trafficintelligence/storage.py	Wed Jul 11 15:01:37 2018 -0400
@@ -1357,10 +1357,10 @@
     method parameters, etc. for tracking and safety
 
     Note: framerate is already taken into account'''
-    
-    def loadTrackerConfig(self, filename = None):
+
+    def loadConfigFile(self, filename):
         from configparser import ConfigParser
-        
+
         config = ConfigParser({ 'acceleration-bound' : '3', 
                                 'min-velocity-cosine' : '0.8', 
                                 'ndisplacements' : '3', 
@@ -1379,80 +1379,7 @@
                                 'min-feature-time' : '15',
                                 'min-feature-displacement' : '0.05',
                                 'tracker-reload-time' : '10'}, strict=False)
-        if filename is not None:
-            config.read_file(addSectionHeader(utils.openCheck(filename)))
-            self.sectionHeader = config.sections()[0]
-        else:
-            self.sectionHeader = 'DEFAULT'
-            
-        
-        #Tracker parameters
-        self.accelerationBound = config.getint(self.sectionHeader, 'acceleration-bound')
-        self.minVelocityCosine = config.getfloat(self.sectionHeader, 'min-velocity-cosine')
-        self.ndisplacements = config.getint(self.sectionHeader, 'ndisplacements')
-        self.maxNFeatures = config.getint(self.sectionHeader, 'max-nfeatures')
-        self.minFeatureDistanceKLT = config.getfloat(self.sectionHeader, 'min-feature-distanceklt')
-        self.featureQuality = config.getfloat(self.sectionHeader, 'feature-quality')
-        self.blockSize = config.getint(self.sectionHeader, 'block-size')
-        self.useHarrisDetector = config.getboolean(self.sectionHeader, 'use-harris-detector')
-        self.k = config.getfloat(self.sectionHeader, 'k')
-        self.winSize = config.getint(self.sectionHeader, 'window-size')
-        self.pyramidLevel = config.getint(self.sectionHeader, 'pyramid-level')
-        self.maxNumberTrackingIterations = config.getint(self.sectionHeader, 'max-number-iterations')
-        self.minTrackingError = config.getfloat(self.sectionHeader, 'min-tracking-error')
-        self.featureFlags = config.getboolean(self.sectionHeader, 'feature-flag')
-        self.minFeatureEigThreshold = config.getfloat(self.sectionHeader, 'min-feature-eig-threshold')
-        self.minFeatureTime = config.getint(self.sectionHeader, 'min-feature-time')
-        self.minFeatureDisplacement = config.getfloat(self.sectionHeader, 'min-feature-displacement')
-        self.updateTimer = config.getint(self.sectionHeader, 'tracker-reload-time')
-        
-    def loadHomographyConfig(self, filename = None):
-        
-        if filename is None:
-            self.homographyFilename = None
-            self.homography = None
-        else :
-            from configparser import ConfigParser
-            config = ConfigParser(strict=False)
-            config.read_file(addSectionHeader(utils.openCheck(filename)))
-            parentPath = Path(filename).parent
-            self.sectionHeader = config.sections()[0]
-            self.homographyFilename = utils.getRelativeFilename(parentPath, config.get(self.sectionHeader, 'homography-filename'))
-            if Path(self.homographyFilename).exists():
-                self.homography = loadtxt(self.homographyFilename)
-            else:
-                self.homography = None
-            
-    def loadDistortionConfig(self, filename = None):
-        if filename is None:
-            self.intrinsicCameraFilename = None
-            self.intrinsicCameraMatrix = None
-            self.distortionCoefficients = None
-            self.undistort = False
-            self.undistortedImageMultiplication = 1.
-        else:
-            from configparser import ConfigParser
-            config = ConfigParser(strict=False)
-            config.read_file(addSectionHeader(utils.openCheck(filename)))
-            parentPath = Path(filename).parent
-            self.sectionHeader = config.sections()[0]
-            self.intrinsicCameraFilename = utils.getRelativeFilename(parentPath, config.get(self.sectionHeader, 'intrinsic-camera-filename'))
-            if Path(self.intrinsicCameraFilename).exists():
-                self.intrinsicCameraMatrix = loadtxt(self.intrinsicCameraFilename)
-            else:
-                self.intrinsicCameraMatrix = None
-            distortionCoefficients = getValuesFromINIFile(filename, 'distortion-coefficients', '=')        
-            self.distortionCoefficients = [float(x) for x in distortionCoefficients]
-            self.undistortedImageMultiplication  = config.getfloat(self.sectionHeader, 'undistorted-size-multiplication')
-            self.undistort = config.getboolean(self.sectionHeader, 'undistort')
-            
-
-    def loadConfigFile(self, filename):
-        from configparser import ConfigParser
-
-        config = ConfigParser(strict=False)
         config.read_file(addSectionHeader(utils.openCheck(filename)))
-
         parentPath = Path(filename).parent
         self.sectionHeader = config.sections()[0]
         # Tracking/display parameters
@@ -1474,8 +1401,6 @@
         self.undistort = config.getboolean(self.sectionHeader, 'undistort')
         self.firstFrameNum = config.getint(self.sectionHeader, 'frame1')
         self.videoFrameRate = config.getfloat(self.sectionHeader, 'video-fps')
-
-        self.minFeatureTime = config.getint(self.sectionHeader, 'min-feature-time')
         
         self.classifierFilename = utils.getRelativeFilename(parentPath, config.get(self.sectionHeader, 'classifier-filename'))
         
@@ -1497,7 +1422,26 @@
         self.lcssMetric = config.get(self.sectionHeader, 'lcss-metric')
         self.minLcssSimilarity = config.getfloat(self.sectionHeader, 'min-lcss-similarity')
         
-        self.configFilename = filename
+        # Tracking parameters
+        self.accelerationBound = config.getint(self.sectionHeader, 'acceleration-bound')
+        self.minVelocityCosine = config.getfloat(self.sectionHeader, 'min-velocity-cosine')
+        self.ndisplacements = config.getint(self.sectionHeader, 'ndisplacements')
+        self.maxNFeatures = config.getint(self.sectionHeader, 'max-nfeatures')
+        self.minFeatureDistanceKLT = config.getfloat(self.sectionHeader, 'min-feature-distanceklt')
+        self.featureQuality = config.getfloat(self.sectionHeader, 'feature-quality')
+        self.blockSize = config.getint(self.sectionHeader, 'block-size')
+        self.useHarrisDetector = config.getboolean(self.sectionHeader, 'use-harris-detector')
+        self.k = config.getfloat(self.sectionHeader, 'k')
+        self.winSize = config.getint(self.sectionHeader, 'window-size')
+        self.pyramidLevel = config.getint(self.sectionHeader, 'pyramid-level')
+        self.maxNumberTrackingIterations = config.getint(self.sectionHeader, 'max-number-iterations')
+        self.minTrackingError = config.getfloat(self.sectionHeader, 'min-tracking-error')
+        self.featureFlags = config.getboolean(self.sectionHeader, 'feature-flag')
+        self.minFeatureEigThreshold = config.getfloat(self.sectionHeader, 'min-feature-eig-threshold')
+        self.minFeatureTime = config.getint(self.sectionHeader, 'min-feature-time')
+        self.minFeatureDisplacement = config.getfloat(self.sectionHeader, 'min-feature-displacement')
+        self.updateTimer = config.getint(self.sectionHeader, 'tracker-reload-time')
+        
 
     def __init__(self, filename = None):
         if filename is not None and Path(filename).exists():