Fix merge remote-tracking branch 'origin/develop' into addDiagnostics

DAS/results.py

@@ -23,7 +23,7 @@ class Result:
         missingSamples = missingVector[-1]
         if missingSamples == 0:
             self.blockAvailable = 1
-            self.tta = len(missingVector) * (1000/config.stepDuration)
+            self.tta = len(missingVector) * (config.stepDuration)
         else:
             self.blockAvailable = 0
             self.tta = -1

DAS/simulator.py

@@ -71,7 +71,6 @@ class Simulator:
                     j = i - int(heavyVal/self.shape.vpn2)
                     start = offset+(  j  *self.shape.chi)
                     end   = offset+((j+1)*self.shape.chi)
-                # Remove duplicates
                 r = set(rows[start:end])
                 c = set(columns[start:end])
                 val = Validator(i, int(not i!=0), self.logger, self.shape, r, c)