lib/trinitycrmod/graphs.rb in trinitycrmod-0.7.6 vs lib/trinitycrmod/graphs.rb in trinitycrmod-0.7.7

@@ -120,32 +120,33 @@
       kit.each_with_index do |k,ik|
         kit[ik] = integrate_profkit(k, area_vectors, t_indices)
       end
 
     end
+    
+    # Graph of the ion heat calibration factor
+    def ion_hflux_calibration_graphkit(options)
+      calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+      k = calibs.map{|c| c.qflux_graphkit(0)}.sum
+      k.ylabel = 'Qi'
+      k
+    end
+    # Graph of the electron heat calibration factor
+    def eln_hflux_calibration_graphkit(options)
+      calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+      k = calibs.map{|c| c.qflux_graphkit(1)}.sum
+      k.ylabel = 'Qe'
+      k
+    end
+    # Graph of the particle flux calibration factor
+    def pflux_calibration_graphkit(options)
+      calibs = Calib.analyse_file("#@directory/#@run_name.calib")
+      k = calibs.map{|c| c.pflux_graphkit(1)}.sum
+      k.ylabel = 'Gamma'
+      k
+    end
   end
 
-  # Graph of the ion heat calibration factor
-  def ion_hflux_calibration_graphkit(options)
-    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
-    k = calibs.map{|c| c.qflux_graphkit(0)}.sum
-    k.ylabel = 'Qi'
-    k
-  end
-  # Graph of the electron heat calibration factor
-  def eln_hflux_calibration_graphkit(options)
-    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
-    k = calibs.map{|c| c.qflux_graphkit(1)}.sum
-    k.ylabel = 'Qe'
-    k
-  end
-  # Graph of the particle flux calibration factor
-  def pflux_calibration_graphkit(options)
-    calibs = Calib.analyse_file("#@directory/#@run_name.calib")
-    k = calibs.map{|c| c.pflux_graphkit(1)}.sum
-    k.ylabel = 'Gamma'
-    k
-  end
 
   include TrinityGraphKits
 
   module TrinityMultiKits
     def profiles_graphkit(options)