radiation 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f29855b4ccd0f96cddf10bcb0894f485590427
-  data.tar.gz: 146cc71fdce525e11a2725adcc1f0486d3606817
+  metadata.gz: b5bfb4c9fc90f1e6af82e9453053767b9483ade2
+  data.tar.gz: afb5250753754a77fe44e655c9026c663f7b0b51
 SHA512:
-  metadata.gz: 3f153422a4b736cb1115bbc349c86cc241670182da9a5d144d794491a8d1d39cb2a76e25d36229855ea8852b48fc2328913a25137c94eec3248db217591571b0
-  data.tar.gz: 46950dbba8bb8e84c3f42b09715898a4045a176fec1f708548659215b2cb9ced2a5a46094702c5221768aed92ef33300d6f222e8f751d8e1deb0ad91873a9537
+  metadata.gz: e95bb41b2be01ff2539dc2ea16310c3a789cf5b5d55ee790da0e13bccf58ff0fece8f1a8ea5e3d1061f8787708bb0341a4d97e8c7710f29eccf4bfe36b11686b
+  data.tar.gz: 215a30b97034057ae3b2f56a97742cf7718f313d8f0de2ea9fb65111abbd8fbda55db9cf5f14475fcef53315d248283c00897d6203952c88e2aa9d2c1f6777e4

data/data/iaea-xgamma.json

@@ -2482,11 +2482,155 @@
     "description": null,
     "absolute_intensities": 1,
     "transitions": [
+      {
+        "energy": 53.2275,
+        "energy_uncertainty": 0.0021,
+        "intensity": 0.01066,
+        "intensity_uncertainty": 0.00014
+      },
       {
         "energy": 186.211,
         "energy_uncertainty": 0.013,
         "intensity": 0.03533,
         "intensity_uncertainty": 0.00028
+      },
+      {
+        "energy": 241.997,
+        "energy_uncertainty": 0.003,
+        "intensity": 0.0719,
+        "intensity_uncertainty": 0.0006
+      },
+      {
+        "energy": 295.224,
+        "energy_uncertainty": 0.002,
+        "intensity": 0.1828,
+        "intensity_uncertainty": 0.0014
+      },
+      {
+        "energy": 351.932,
+        "energy_uncertainty": 0.002,
+        "intensity": 0.3534,
+        "intensity_uncertainty": 0.0027
+      },
+      {
+        "energy": 609.316,
+        "energy_uncertainty": 0.003,
+        "intensity": 0.4516,
+        "intensity_uncertainty": 0.0033
+      },
+      {
+        "energy": 665.453,
+        "energy_uncertainty": 0.022,
+        "intensity": 0.01521,
+        "intensity_uncertainty": 0.00011
+      },
+      {
+        "energy": 768.367,
+        "energy_uncertainty": 0.011,
+        "intensity": 0.0485,
+        "intensity_uncertainty": 0.00038
+      },
+      {
+        "energy": 806.185,
+        "energy_uncertainty": 0.011,
+        "intensity": 0.01255,
+        "intensity_uncertainty": 0.00011
+      },
+      {
+        "energy": 934.061,
+        "energy_uncertainty": 0.012,
+        "intensity": 0.03074,
+        "intensity_uncertainty": 0.00025
+      },
+      {
+        "energy": 1120.287,
+        "energy_uncertainty": 0.01,
+        "intensity": 0.1478,
+        "intensity_uncertainty": 0.0011
+      },
+      {
+        "energy": 1155.19,
+        "energy_uncertainty": 0.02,
+        "intensity": 0.01624,
+        "intensity_uncertainty": 0.00014
+      },
+      {
+        "energy": 1238.11,
+        "energy_uncertainty": 0.012,
+        "intensity": 0.05785,
+        "intensity_uncertainty": 0.00045
+      },
+      {
+        "energy": 1280.96,
+        "energy_uncertainty": 0.02,
+        "intensity": 0.01425,
+        "intensity_uncertainty": 0.00012
+      },
+      {
+        "energy": 1377.669,
+        "energy_uncertainty": 0.012,
+        "intensity": 0.03954,
+        "intensity_uncertainty": 0.00033
+      },
+      {
+        "energy": 1401.516,
+        "energy_uncertainty": 0.014,
+        "intensity": 0.01324,
+        "intensity_uncertainty": 0.00011
+      },
+      {
+        "energy": 1407.993,
+        "energy_uncertainty": 0.007,
+        "intensity": 0.02369,
+        "intensity_uncertainty": 0.00019
+      },
+      {
+        "energy": 1509.217,
+        "energy_uncertainty": 0.008,
+        "intensity": 0.02108,
+        "intensity_uncertainty": 0.00021
+      },
+      {
+        "energy": 1661.316,
+        "energy_uncertainty": 0.013,
+        "intensity": 0.01037,
+        "intensity_uncertainty": 0.0001
+      },
+      {
+        "energy": 1729.64,
+        "energy_uncertainty": 0.012,
+        "intensity": 0.02817,
+        "intensity_uncertainty": 0.00023
+      },
+      {
+        "energy": 1764.539,
+        "energy_uncertainty": 0.015,
+        "intensity": 0.1517,
+        "intensity_uncertainty": 0.0012
+      },
+      {
+        "energy": 1847.42,
+        "energy_uncertainty": 0.025,
+        "intensity": 0.02,
+        "intensity_uncertainty": 0.00018
+      },
+      {
+        "energy": 2118.536,
+        "energy_uncertainty": 0.008,
+        "intensity": 0.01148,
+        "intensity_uncertainty": 0.00011
+      },
+      {
+        "energy": 2204.071,
+        "energy_uncertainty": 0.021,
+        "intensity": 0.0489,
+        "intensity_uncertainty": 0.001
+      },
+      {
+        "energy": 2447.673,
+        "energy_uncertainty": 0.01,
+        "intensity": 0.01536,
+        "intensity_uncertainty": 0.00015
       }
     ]
   },

data/lib/radiation.rb

@@ -2,7 +2,6 @@ require "radiation/version"
 require "radiation/source"
 require "radiation/spectrum"
 require "radiation/resource"
-require 'radiation/resource/internal'
 require 'radiation/resource/nucleideorg'
 require 'radiation/resource/iaea'
 

data/lib/radiation/cli.rb

@@ -14,7 +14,7 @@ class CLI < Thor
 	option :resource
 	desc "source NUCLIDE", "decay radiation data"
 	def source(nuclide)
-		resource = options[:resource] ? options[:resource] : "internal"
+		resource = options[:resource] ? options[:resource] : "iaea"
 		puts ["E_ɣ", "ΔE_ɣ", "I_ɣ", "ΔI_ɣ"].join("\t")
 		puts Radiation::Source.new(nuclide: nuclide, resource: resource).intensities.collect{|l| [l[:energy].value, l[:energy].delta, l[:intensity].value, l[:intensity].delta].join("\t") }
 	end
@@ -33,7 +33,7 @@ class CLI < Thor
 	With --resource=nucleide.org more decay radiation sources are available.
 	LONGDESC
 	def calibrate(nuclide, file)
-		resource = options[:resource] ? options[:resource] : "internal"
+		resource = options[:resource] ? options[:resource] : "iaea"
 		source   = Radiation::Source.new(nuclide: nuclide, resource: resource)
 		spectrum = Radiation::Spectrum.new(source: source ).parse_hdtv(file)
 		spectrum.calibrate.calibration.each{|c| puts c}
@@ -50,7 +50,7 @@ class CLI < Thor
 	With --mini=value transitions with small intensities can be supressed (default 0.3)
 	LONGDESC
 	def efficiency(nuclide, file)
-		resource = options[:resource] ? options[:resource] : "internal"
+		resource = options[:resource] ? options[:resource] : "iaea"
 		mini = options[:mini] ? options[:mini].to_f : 0.003
 		source   = Radiation::Source.new(nuclide: nuclide, resource: resource)
 		spectrum = Radiation::Spectrum.new(source: source ).parse_hdtv(file)

data/lib/radiation/source.rb

@@ -2,19 +2,18 @@
 module Radiation
 	class Source
 		attr_reader :resource, :nuclide, :halflife, :reference, :description, :transitions
-	
+
 		def initialize(options={})
-			@resource = options.key?(:resource) ? options[:resource].to_s : "internal"
+			@resource = options.key?(:resource) ? options[:resource].to_s : "iaea"
 			@nuclide  = options[:nuclide].to_s if options.key?(:nuclide)
 			fetch if @resource and @nuclide
 		end
-	
+
 		def fetch(options={})
 			@resource = options[:resource].to_s if options.key?(:resource)
 			@nuclide  = options[:nuclide].to_s  if options.key?(:nuclide)
 			raise "Nuclide: #{@nuclide} is not valid." unless is_nuclide?(@nuclide)
 			data = case @resource
-				when "internal" then Radiation::Resource::Internal.new.fetch(@nuclide).data
 				when "iaea" then Radiation::Resource::IAEA.new.fetch(@nuclide).data
 				when "nucleide.org" then Radiation::Resource::Nucleideorg.new.fetch(@nuclide).data
 				else raise "Unknown Datasource"
@@ -24,33 +23,33 @@ module Radiation
 		end
 
 		def resources
-			["internal", "iaea", "nucleide.org"]
+			["iaea", "nucleide.org"]
 		end
-	
+
 		def read(options={})
 			@resource = "external"
 			build(options)
 			return self
 		end
-	
+
 		def energies
 			self.transitions.collect{|line| line[:energy]}
 		end
-	
+
 		def intensities
 			self.transitions.select{|line| line[:intensity] > 0}.collect{|line| {:energy => line[:energy], :intensity => line[:intensity]} }
 		end
-	
+
 		def is_nuclide?(nuclide)
 			!!(nuclide =~ /\A[a-zA-Z]{1,2}-\d{1,3}\z/)
 		end
-	
+
 	private
 		def build(data)
 			[:nuclide, :halflife, :reference, :description, :transitions].each do |key|
 				instance_variable_set("@#{key}", data[key]) if data.key?(key)
 			end
 		end
-	
+
 	end
 end

data/lib/radiation/version.rb

@@ -1,3 +1,3 @@
 module Radiation
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/radiation_spec.rb

@@ -57,11 +57,11 @@ describe Radiation do
 		source = Radiation::Source.new(nuclide: "Ra-226")
 
 		it "can guess a inital energy calibration based on adc values" do
-			Radiation::Spectrum.new(peaks: peaks, source: source).guess_calibration.calibration.should be == [0, 0.3597]
+			Radiation::Spectrum.new(peaks: peaks, source: source).guess_calibration.calibration.should be == [0, 0.3595]
 		end
 
 		it "can match channels to given energies by using a calibration" do
-			Radiation::Spectrum.new(peaks: peaks, source: source ).guess_calibration.match_channels.peaks[0][:energy].should be == 186.2
+			Radiation::Spectrum.new(peaks: peaks, source: source ).guess_calibration.match_channels.peaks[0][:energy].should be_within(0.1).of(186.2)
 		end
 
 		it "can calibrate a spectrum" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiation
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plusminus
@@ -153,16 +153,11 @@ files:
 - README.md
 - Rakefile
 - bin/radiation
-- data/Eu-152.bib
-- data/Eu-152.csv
-- data/Ra-226.bib
-- data/Ra-226.csv
 - data/iaea-xgamma.json
 - lib/radiation.rb
 - lib/radiation/cli.rb
 - lib/radiation/resource.rb
 - lib/radiation/resource/iaea.rb
-- lib/radiation/resource/internal.rb
 - lib/radiation/resource/nucleideorg.rb
 - lib/radiation/source.rb
 - lib/radiation/spectrum.rb

data/data/Eu-152.bib

@@ -1,9 +0,0 @@
-@book{IAEATECDOC619,
-title = "X-ray and gamma-ray standards for detector calibration",
-journal = "IAEA TECDOC",
-volume = "619",
-year = "1991",
-issn = "1011-4289"
-url = "http://www-pub.iaea.org/books/iaeabooks/875/X-ray-and-Gamma-ray-Standards-for-Detector-Calibration",
-author = "A. Lorenz and H.D. Leram"
-}

data/data/Eu-152.csv

@@ -1,15 +0,0 @@
-121.8;0.2837;0.0013
-123.1;0.412;0.005
-244.7;0.0753;0.0004
-344.3;0.2657;0.0011
-411.1;0.02238;0.0001
-444.0;0.03125;0.00014
-778.9;0.1297;0.0006
-867.4;0.04214;0.00025
-964.0;0.1463;0.0006
-1085.9;0.1013;0.0005
-1089.7;0.01731;0.00009
-1112.1;0.1354;0.0006
-1212.9;0.01412;0.00008
-1299.1;0.01626;0.00011
-1408.0;0.2085;0.0009

data/data/Ra-226.bib

@@ -1,13 +0,0 @@
-@article{Delgado2002137,
-title = "Measurements of photon emission probabilities from the decay of 226Ra and daughters ",
-journal = "Applied Radiation and Isotopes ",
-volume = "56",
-number = "1–2",
-pages = "137 - 143",
-year = "2002",
-note = "<ce:title>Proceedings of the Conference on Radionuclide Metrology and its A pplications, ICRM'01</ce:title> ",
-issn = "0969-8043",
-doi = "10.1016/S0969-8043(01)00179-8",
-url = "http://www.sciencedirect.com/science/article/pii/S0969804301001798",
-author = "José U Delgado and Jean Morel and Michel Etcheverry"
-}

data/data/Ra-226.csv

@@ -1,34 +0,0 @@
-186.2;3.502;0.8
-242.0;7.13;0.7
-258.8;0.525;1.0
-274.2;0.472;1.2
-295.2;18.09;0.7
-351.9;35.04;0.7
-388.0;0.690;1.5
-455.0;0.287;2.0
-480.5;0.336;1.4
-487.1;0.431;1.4
-580.3;0.369;1.5
-609.3;44.83;0.7
-665.4;1.506;0.8
-768.4;4.78;0.8
-785.8;1.097;1.1
-806.2;1.250;1.0
-934.1;3.041;0.8
-1120.3;14.66;0.7
-1155.2;1.611;1.2
-1238.1;5.75;0.8
-1281.0;1.411;1.1
-1377.7;3.895;0.8
-1385.3;0.782;1.2
-1401.5;1.311;0.9
-1408.0;2.346;0.8
-1509.2;2.065;1.5
-1661.3;1.063;1.6
-1729.6;2.791;0.8
-1764.5;15.03;0.7
-1847.4;1.994;1.0
-2118.5;1.137;1.0
-2204.1;4.82;0.8
-2293.36;0.298;2.6
-2447.7;1.525;0.9

data/lib/radiation/resource/internal.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-require 'csv'
-
-module Radiation::Resource
-	class Internal < Base
-		# FIXME: Better path creation
-		PATH = File.join(File.dirname(__FILE__), "../../../data")
-		
-		def fetch(nuclide)
-			@nuclide = nuclide
-			begin
-				@data[:nuclide] = @nuclide.to_s
-				@data[:transitions] = load_data(@nuclide).collect{|row| {:energy => row[0].pm(0), :intensity => row[1].pm(row[2])} }
-			rescue
-				raise "No Data for #{nuclide}"
-			end
-			self
-		end
-
-		private
-		def load_data(nuclide)
-			CSV.read("#{PATH}/#{nuclide}.csv",  {col_sep: ';', converters: :numeric})
-		end
-	
-	end
-end