radiation 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQ3OGQyOWMzYWFjMGFjMjMzNTE4OGM0YTMxNmQ1MjdjZGNmOGZmZA==
+    NDQxMmMyNzdkMmY0NzUxMTE0NmQ4NzQ2ZTYwMTBiNzhlZWI5ZTViMQ==
   data.tar.gz: !binary |-
-    YTliN2YzZGYwNmEzODgwMDdkOTRiOWQ5NTkyNzIxMjYwZjhlMThlNw==
+    ZjU3MzFhMTA1YzA2ODgyZTJlYzhhNjRlYjhmMjQ1MjQ4MzRkZTM1OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjI5NmZjMGRkMDMzMjQyMzBkYWRhODU3ZTNjMTYwYzY0YTcwOWM4N2JiMTJi
-    NWYxMWRjMmViNGJhNTY0MzJiMzMyYTIwODU3ZGM1ZmU3MjFlMTk1OThkMjQ2
-    MTkwZTg2MWMxMjZmZDBlNjdlNWNiNDEzOWYyYTg5Mzg4MzM1M2U=
+    MjJhYzU4ZmZmYjY1NTUyM2I5MzU4ZWRkOWY0ODViZjM4NGVmY2U4MGJlY2Q1
+    MTU5ZGNmZTY2ZjQwY2QyZGIyYjcxNWRhYWExMjdmZTgyOWUzODBiZTBlMjQy
+    OGY0MmIxZjBkMzM5NzhjMzcyZGMzOGIyZGYzZWUzYjI2ZTdkYjU=
   data.tar.gz: !binary |-
-    NDMwNjczZWQyMjM2YmIyYjFhODRlY2FmMDUzNDE3ZGZjNzI1ZDQwNWU2NTVk
-    ODM5MTI2ODUyOWIzOTlkNWExZTA5OWZlOGM2NDdlYzE3NDEyNDhhMTMyMjkz
-    YWM2ZjU4Nzg2MTAwM2U2ODEwOTI0ZGJjZWU5NWQwZmEzN2NjMmQ=
+    ZDBkZTg1OWY1Y2IxYzQzMWEzMjJhODU0YmExNWJkNTczOWMwMGZiY2FjMjI4
+    MTYwN2M5MTczNzc5NGRiMmZmMzM2NTJmMTFkNDkxNzQ2YWY0MDBkNzQwZGQx
+    ZmZlODEwYzlmM2JiYjAyY2MzNjlmMjljOTVlNTljMzYwYzIwMmM=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.3
+
+* Added basic parsing for hdtv xml files
+* Changed dependency for linefit
+
 ## v0.0.2
 
 * Added spectrum class with energy calibration options

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "linefit", git: "https://github.com/janmayer/linefit.git"
+#gem "linefit", git: "https://github.com/janmayer/linefit.git"
 # Specify your gem's dependencies in radiation.gemspec
 gemspec

data/README.md

@@ -1,4 +1,7 @@
-# Radiation [![Build Status](https://travis-ci.org/janmayer/radiation.png?branch=master)](https://travis-ci.org/janmayer/radiation)
+# Radiation
+[![Gem Version](https://badge.fury.io/rb/radiation.png)](http://badge.fury.io/rb/radiation)
+[![Build Status](https://travis-ci.org/janmayer/radiation.png?branch=master)](https://travis-ci.org/janmayer/radiation)
+[![Code Climate](https://codeclimate.com/github/janmayer/radiation.png)](https://codeclimate.com/github/janmayer/radiation)
 
 This gem provides easy access to energies and intensities from the decay of radioactive nuclei. 
 Currently two data sources are accessible: Internal (see bib files in `./data/`) and recommended values 

data/lib/radiation/spectrum.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "linefit"
 require "plusminus"
+require "xmlsimple"
 
 class Radiation::Spectrum
 	attr_accessor :peaks, :source, :calibration
@@ -39,7 +40,7 @@ class Radiation::Spectrum
 	def match_channels(energies=@source.energies, rounding=4)
 		@peaks.each do |peak|
 			energies.each do |energy|
-				peak[:energy] = energy if channel_energy(peak[:channel]).approx_equal?(energy, rounding)
+				peak[:energy] = energy if channel_energy(peak[:channel]).to_f.approx_equal?(energy, rounding)
 			end
 		end
 		return self
@@ -58,6 +59,15 @@ class Radiation::Spectrum
 		@calibration[0] + @calibration[1]*chn
 	end
 
+	def parse_hdtv(file)
+		xml = XmlSimple.xml_in(file, { 'KeyAttr' => 'name' })
+		@peaks = xml["fit"].collect{|p| p["peak"]}.flatten.collect{|p| p["uncal"]}.flatten.collect do |p|
+			{:channel => p["pos"].first["value"].first.to_f.pm(p["pos"].first["error"].first.to_f),
+	 		:counts => p["vol"].first["value"].first.to_f.pm(p["vol"].first["error"].first.to_f) } 
+		end
+		return self
+	end
+
 end
 
 

data/lib/radiation/version.rb

@@ -1,3 +1,3 @@
 module Radiation
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/radiation.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "plusminus"
   spec.add_dependency "open-uri-cached"
   spec.add_dependency "combinatorics"
-  spec.add_dependency "linefit", "~> 0.3.1"
+  spec.add_dependency "linefit"
+  spec.add_dependency "xml-simple"
 
   
   spec.add_development_dependency "bundler", "~> 1.3"