diff -Nru horae-071~svn533/debian/changelog horae-071~svn536/debian/changelog --- horae-071~svn533/debian/changelog 2010-07-29 07:06:51.000000000 +0000 +++ horae-071~svn536/debian/changelog 2011-06-20 17:07:17.000000000 +0000 @@ -1,3 +1,10 @@ +horae (071~svn536-1) unstable; urgency=low + + * New plugin files in SVN pull + * Upgrade to Standards-Version 3.9.2 + + -- Carlo Segre Mon, 20 Jun 2011 12:04:52 -0500 + horae (071~svn533-1) unstable; urgency=low * Prerelease SVN pull diff -Nru horae-071~svn533/debian/control horae-071~svn536/debian/control --- horae-071~svn533/debian/control 2010-07-29 07:18:51.000000000 +0000 +++ horae-071~svn536/debian/control 2011-06-20 17:07:32.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends-Indep: perl (>= 5.6.0-16), libchemistry-elements-perl, perl-tk (>= 804), libifeffit-perl Homepage: http://cars9.uchicago.edu/~ravel/software/Welcome.html -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Package: horae Architecture: all diff -Nru horae-071~svn533/debian/rules horae-071~svn536/debian/rules --- horae-071~svn533/debian/rules 2010-05-12 00:41:58.000000000 +0000 +++ horae-071~svn536/debian/rules 2011-06-20 17:19:33.000000000 +0000 @@ -19,7 +19,11 @@ touch configure-stamp -build: build-stamp +build: build-arch build-indep + +build-arch: + +build-indep: build-stamp build-stamp: configure-stamp dh_testdir diff -Nru horae-071~svn533/lib/Ifeffit/Plugins/Filetype/Athena/PFBL12C.pm horae-071~svn536/lib/Ifeffit/Plugins/Filetype/Athena/PFBL12C.pm --- horae-071~svn533/lib/Ifeffit/Plugins/Filetype/Athena/PFBL12C.pm 2010-05-13 13:31:46.000000000 +0000 +++ horae-071~svn536/lib/Ifeffit/Plugins/Filetype/Athena/PFBL12C.pm 2010-10-06 13:40:20.000000000 +0000 @@ -78,14 +78,12 @@ open my $N, ">".$new or die "could not write to $new (fix in PFBL12C)\n"; my $header = 1; - my @offsets; while (<$D>) { next if ($_ =~ m{\A\s*\z}); last if ($_ =~ m{}); chomp; if ($header and ($_ =~ m{\A\s+offset}i)) { my $this = $_; - @offsets = split(" ", $this); print $N '# ', $_, $/; print $N '# --------------------------------------------------', $/; print $N '# energy_requested energy_attained time i0 i1 ', $/; @@ -102,7 +100,7 @@ $list[1] = (HC) / ($ddistance * sin($list[1] * PI / 180)); my $ndet = $#list-2; foreach my $i (1..$ndet) { - $list[2+$i] = $list[2+$i] - $offsets[2+$i]; + $list[2+$i] = $list[2+$i]; }; my $pattern = " %9.3f %9.3f %6.2f" . " %12.3f" x $ndet . $/; printf $N $pattern, @list; diff -Nru horae-071~svn533/lib/Ifeffit/Plugins/Filetype/Athena/SSRLB.pm horae-071~svn536/lib/Ifeffit/Plugins/Filetype/Athena/SSRLB.pm --- horae-071~svn533/lib/Ifeffit/Plugins/Filetype/Athena/SSRLB.pm 2008-09-25 15:20:17.000000000 +0000 +++ horae-071~svn536/lib/Ifeffit/Plugins/Filetype/Athena/SSRLB.pm 2010-09-01 21:28:59.000000000 +0000 @@ -3,7 +3,7 @@ =head1 NAME -Ifeffit::Plugin::Filetype::Athena::SSRL - SSRL XAFS Data Collector 1.3 Binary filetype plugin +Ifeffit::Plugin::Filetype::Athena::SSRL - SSRL XAFS Data Collector Binary filetype plugin =head1 SYNOPSIS @@ -67,8 +67,8 @@ use vars qw($is_binary $description); $is_binary = 1; -$description = "Read Binary files from the SSRL XAFS Data Collector 1.3."; - +$description = "Read Binary files from the SSRL XAFS Data Collector."; +my $ssrlb_version = 1.2; sub is { shift; @@ -77,7 +77,8 @@ open D, $data or die "could not open $data as data (SSRL)\n"; my $line; read D, $line, 40; - my $is_ssrl = ($line =~ m{^\s*SSRL\s+\-\s+EXAFS Data Collector}); + my $is_ssrl = ($line =~ m{^\s*SSRL\s+\-\s+EXAFS Data Collector\s+(\d+\.\d+)}); + $ssrlb_version=$1; read D, $line, 40; my $is_bin = ($line =~ m{$null}); close D; @@ -152,8 +153,9 @@ my @line; foreach my $i (1..$ncol) { my $j = $i-1; - my $this = ieee(substr($var,$j*4,4)); - push @line, unpack('f', $this)/4; + my $this = ($ssrlb_version < 2.0) ? ieee(substr($var,$j*4,4)) : substr($var,$j*4,4); + my $factor = ($ssrlb_version < 2.0) ? 4 : 1; + push @line, unpack('f', $this)/$factor; }; $pattern = 'f'.$ncol; print N ' ', join(' ', map {sprintf "%.3f", $_} @line[2,1,0,3..$#line]), $/;