LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Fixed some bugs.

Browse Source
This commit is contained in:
salman 2009-10-08 14:17:57 +00:00
parent 404028c478
commit fcdc91996e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/external/MuSRFitGUI/msr2dat vendored
View File

@ -57,7 +57,7 @@ foreach $Arg (@ARGV) {
# Nice trick, make a hash for unique RUN lines # Nice trick, make a hash for unique RUN lines
# Find spectrum lines # Find spectrum lines
@MAPS = grep {/map/} @file; @MAPS = grep {/map /} @file;
@RUNS = grep {/RUN/} @file; @RUNS = grep {/RUN/} @file;
$counter=0; $counter=0;
foreach $key (@RUNS){ foreach $key (@RUNS){
@ -70,10 +70,11 @@ foreach $Arg (@ARGV) {
# Number of runs (or independent sets of parameters) in this file # Number of runs (or independent sets of parameters) in this file
$NRUNS=1; $NRuns=1;
foreach (sort { $RUN{$a} <=> $RUN{$b}} keys %RUN ) { foreach (sort { $RUN{$a} <=> $RUN{$b}} keys %RUN ) {
@RunParams=(); @RunParams=();
$NP=0; $NP=0;
# print $_."=".$MAP{$_}."\n";
@tmp=split(/\s+/,$MAP{$_}); @tmp=split(/\s+/,$MAP{$_});
# Remove first element (map) # Remove first element (map)
shift(@tmp); shift(@tmp);
@ -112,14 +113,15 @@ foreach $Arg (@ARGV) {
# For the values from all the files. # For the values from all the files.
# I am not checking if all the files have the same theory function # I am not checking if all the files have the same theory function
for ($i=1;$i<=$NRuns;$i++) { for ($i=1;$i<=$NRuns-1;$i++) {
@Pnum=split(/,/,$RUNParams[$i]); # print "RUN: ".$i." Params:".$RUNParams[$i]."\n";
# First go for the shared parameters @Pnum=split(/,/,$RUNParams[$i]);
foreach (@Pnum,@Shared) { # First go for the shared parameters
($value,$err)=split(/,/,$P{$_}); foreach (@Pnum,@Shared) {
$DatFile=join("\t",$DatFile,$value,$err); ($value,$err)=split(/,/,$P{$_});
} $DatFile=join("\t",$DatFile,$value,$err);
$DatFile=$DatFile."\n"; }
$DatFile=$DatFile."\n";
} }
# Go to the next file # Go to the next file

2
src/external/MuSRFitGUI/musrfit.cgi vendored
View File

@ -726,7 +726,7 @@ $TITLE
</tr> </tr>
<tr> <tr>
<td colspan=\"1\" valign=\"top\" style=\"width: 90px\"> <td colspan=\"1\" valign=\"top\" style=\"width: 90px\">
<table cellspacing=\"2\" border=\"2\"> <table cellspacing=\"2\" border=\"2\" bgcolor=\"#E0E0E0\">
<tbody> <tbody>
<tr> <tr>
<td> <td>