Removed sha-bang from non-executable python files + whitespace cleanups.

[hooke.git] / hooke / plugin / massanalysis.py

diff --git a/hooke/plugin/massanalysis.py b/hooke/plugin/massanalysis.py
index e3d3830063ea67cd5204719eeaf9780df3de83f8..6fcb03d87f325914c985f03541ba07e6f8b5b122 100644 (file)
--- a/hooke/plugin/massanalysis.py
+++ b/hooke/plugin/massanalysis.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 '''
 massanalysis.py
 
@@ -21,10 +19,10 @@ import csv
 class massanalysisCommands:
 
     def _plug_init(self):
-        self.mass_variables={}        
+        self.mass_variables={}
         self.interesting_variables=['curve','firstpeak_distance','lastpeak_distance','Npeaks','median_distance','mean_distance']
         self._clean_data()
-        
+
     def _clean_data(self):
         for variable in self.interesting_variables:
             self.mass_variables[variable]=[]
@@ -33,18 +31,18 @@ class massanalysisCommands:
         '''
         calculates X distance of a peak from the contact point
         '''
-        item.identify(self.drivers)        
-        
+        item.identify(self.drivers)
+
         real_positions=[]
         cut_index=self.find_contact_point()
-        
+
         #we assume the first is the plot with the force curve
         plot=item.curve.default_plots()[0]
         xret=plot.vectors[1][0]
-        
+
         start_x=xret[cut_index]
-        
-        real_positions=[abs((xret[index])-(start_x)) for index in locations] 
+
+        real_positions=[abs((xret[index])-(start_x)) for index in locations]
         #close all open files
         item.curve.close_all()
         #needed to avoid *big* memory leaks!
@@ -61,39 +59,39 @@ class massanalysisCommands:
         '''
         self._clean_data() #if we recall it, clean previous data!
         min_deviation=self.convfilt_config['mindeviation']
-          
-        
+
+
         c=0
         for item in self.current_list:
             try:
                 peak_location,peak_size=self.exec_has_peaks(item, min_deviation)
                 real_positions=self.peak_position_from_contact(item, peak_location)
-                
+
                 self.mass_variables['Npeaks'].append(len(peak_location))
-                
+
                 if len(peak_location) > 1:
                     self.mass_variables['firstpeak_distance'].append(min(real_positions))
                     self.mass_variables['lastpeak_distance'].append(max(real_positions))
-                    
+
                     distancepeaks=[]
                     for index in range(len(real_positions)-1):
                         distancepeaks.append(real_positions[index+1]-real_positions[index])
                 else:
                     self.mass_variables['firstpeak_distance'].append(0)
-                    self.mass_variables['lastpeak_distance'].append(0)    
-                    
+                    self.mass_variables['lastpeak_distance'].append(0)
+
                 if len(peak_location) > 2:
                     self.mass_variables['median_distance'].append(np.median(distancepeaks))
-                    self.mass_variables['mean_distance'].append(np.mean(distancepeaks))    
+                    self.mass_variables['mean_distance'].append(np.mean(distancepeaks))
                 else:
                     self.mass_variables['median_distance'].append(0)
-                    self.mass_variables['mean_distance'].append(0)   
-                
+                    self.mass_variables['mean_distance'].append(0)
+
                 print 'curve',c
             except SyntaxError:
                 print 'curve',c,'not mapped'
                 pass
-            
+
             c+=1
 
     def do_plotmap(self,args):
@@ -107,37 +105,35 @@ class massanalysisCommands:
             print 'Give me two arguments between those:'
             print self.interesting_variables
             return
-            
+
         scattermap=lhc.PlotObject()
         scattermap.vectors=[[]]
         scattermap.vectors[0].append(x)
         scattermap.vectors[0].append(y)
-        
+
         scattermap.units=[args[0],args[1]]
         scattermap.styles=['scatter']
         scattermap.destination=1
-        
+
         self._send_plot([scattermap])
-        
+
     def do_savemaps(self,args):
         '''
         args=filename
         '''
-        
+
         '''
         def csv_write_cols(data, f):
-            
+
             #from Bruno Desthuillers on comp.lang.python
-            
+
             writer = csv.writer(f)
             keys = data.keys()
             writer.writerow(dict(zip(keys,keys)))
             for row in zip(*data.values()):
-                writer.writerow(dict(zip(keys, row))) 
+                writer.writerow(dict(zip(keys, row)))
         '''
-        
+
         f=open(args,'wb')
         lh.csv_write_dictionary(f,self.mass_variables)
         f.close()
-        
-        
\ No newline at end of file