made signal hash dependent on number of machines (explicitly on paths)

Author: Julian Kates-Harbeck

plasma/conf_parser.py

@@ -102,12 +102,12 @@ def parameters(input_file):
             params['paths']['use_signals_dict'] = jet_signals_1D
         elif params['paths']['data'] == 'jet_data_late':
             params['paths']['shot_files'] = [jet_iterlike_wall_late]
-            params['paths']['shot_files_test'] = [jet_iterlike_wall_late]
+            params['paths']['shot_files_test'] = []
             params['paths']['use_signals_dict'] = jet_signals
         elif params['paths']['data'] == 'jet_data_carbon_to_late_0D':
             params['paths']['shot_files'] = [jet_carbon_wall]
             params['paths']['shot_files_test'] = [jet_iterlike_wall_late]
-            params['paths']['use_signals_dict'] = jet_signals
+            params['paths']['use_signals_dict'] = jet_signals_0D
         elif params['paths']['data'] == 'jet_data_temp_profile':
             params['paths']['shot_files'] = [jet_carbon_wall]
             params['paths']['shot_files_test'] = [jet_iterlike_wall]
@@ -244,7 +244,7 @@ def parameters(input_file):
     return params
 
 def get_unique_signal_hash(signals):
-    return int(hashlib.md5(''.join(tuple(map(lambda x: x.description, sorted(signals)))).encode('utf-8')).hexdigest(),16)
+    return int(hashlib.md5(''.join(tuple(map(lambda x: "{}".format(x.__hash__()), sorted(signals)))).encode('utf-8')).hexdigest(),16)
 
 #make sure 1D signals come last! This is necessary for model builder.
 def sort_by_channels(list_of_signals):

plasma/primitives/data.py

@@ -171,21 +171,23 @@ def get_idx(self,machine):
         idx = self.machines.index(machine)  
         return idx
 
+    def description_plus_paths(self):
+        return self.description + ' ' + ' '.join(self.paths) 
+
     def __eq__(self,other):
         if other is None:
             return False
-        return self.description.__eq__(other.description)
-
+        return self.description_plus_paths().__eq__(other.description_plus_paths())
 
     def __ne__(self,other):
-        return self.description.__ne__(other.description)
+        return self.description_plus_paths().__ne__(other.description_plus_paths())
 
     def __lt__(self,other):
-        return self.description.__lt__(other.description)
+        return self.description_plus_paths().__lt__(other.description_plus_paths())
 
     def __hash__(self):
        import hashlib
-       return int(hashlib.md5(self.description.encode('utf-8')).hexdigest(),16)
+       return int(hashlib.md5(self.description_plus_paths().encode('utf-8')).hexdigest(),16)
 
     def __str__(self):
         return self.description