Repository 'nmr_alignment'
hg clone https://toolshed.g2.bx.psu.edu/repos/marie-tremblay-metatoul/nmr_alignment

Changeset 3:f3ec6799c435 (2017-04-12)
Previous changeset 2:908e1345d7ca (2017-03-31) Next changeset 4:265ee538e120 (2017-08-09)
Commit message:
Uploaded
modified:
nmr_alignement/NmrAlignment_wrapper.R
nmr_alignement/NmrAlignment_xml.xml
nmr_alignement/test-data/MTBLS1.zip
added:
nmr_alignement/test-data/MTBLS1_alignedSpectra.tabular
removed:
nmr_alignement/.Rhistory
nmr_alignement/test-data/MTBLS1_bucketedData.tabular
nmr_alignement/test-data/MTBLS1_sampleMetadata.tabular
nmr_alignement/test-data/MTBLS1_variableMetadata.tabular
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/NmrAlignment_wrapper.R
--- a/nmr_alignement/NmrAlignment_wrapper.R Fri Mar 31 09:56:39 2017 -0400
+++ b/nmr_alignement/NmrAlignment_wrapper.R Wed Apr 12 04:32:23 2017 -0400
[
@@ -17,7 +17,7 @@
 ## Libraries loading
 ##------------------------------
  # ParseCommandArgs function
-library(batch) 
+library(batch)
  # Alignment
 library(speaq)
 
@@ -51,7 +51,7 @@
 if(!runExampleL)
     argLs <- parseCommandArgs(evaluate=FALSE)
 
-
+
 ## Parameters Loading
 ##-------------------
  # Inputs
@@ -61,14 +61,6 @@
  zipfile= argLs[["zipfile"]]
  directory=unzip(zipfile, list=F)
  directory=paste(getwd(),strsplit(directory[1],"/")[[1]][2],sep="/")
-} else if (!is.null(argLs[["library"]])){
- fileType="zip"
- directory=argLs[["library"]]
-     if(!file.exists(directory)){
- error_message=paste("Cannot access the directory :",directory,".Please verify if the directory exists or not.")
- print(error_message)
- stop(error_message)
- }
 } else if (!is.null(argLs[["tsvfile"]])){
  fileType="tsv"
  directory <- read.table(argLs[["tsvfile"]],check.names=FALSE,header=TRUE,sep="\t")
@@ -78,7 +70,7 @@
  ## Spectral width
 leftBorder <- argLs[["left_border"]]
 rightBorder <- argLs[["right_border"]]
-
+
  ##Exclusion zone(s)
 exclusionZones <- argLs[["zone_exclusion_choices.choice"]]
 exclusionZonesBorders <- NULL
@@ -89,13 +81,13 @@
      exclusionZonesBorders <- c(exclusionZonesBorders,list(c(argLs[[i]],argLs[[i+1]])))
    }
 }
-
+
  ## Reference spectrum
 reference <- argLs[["reference"]]
 
  ## Size of a small nDivRange
 nDivRange <- argLs[["nDivRange"]]
-
+
  ## Intensity threshold for peak removal
 baselineThresh <- argLs[["baselineThresh"]]
 
@@ -111,12 +103,12 @@
 error.stock <- "\n"
 if(length(error.stock) > 1)
   stop(error.stock)
-  
-  
+
+
 ## Computation
 ##------------
 directory.alignement <- nmr.alignment(fileType=fileType,directory=directory,leftBorder=leftBorder,rightBorder=rightBorder,exclusionZones=exclusionZones,
-                                  exclusionZonesBorders=exclusionZonesBorders, reference=reference, nDivRange=nDivRange, 
+                                  exclusionZonesBorders=exclusionZonesBorders, reference=reference, nDivRange=nDivRange,
                                   baselineThresh=baselineThresh, maxshift=50, verbose=FALSE)
 directory.raw <- directory.alignement[[1]]
 directory.aligned <- directory.alignement[[2]]
@@ -127,7 +119,7 @@
 t.directory.aligned <- t(directory.aligned)
 rownames(t.directory.aligned) <- colnames(directory.aligned)
 # colnames(t.directory.aligned) <- c("Bucket",colnames(t.directory.aligned))
-write.table(t.directory.aligned,file=alignedSpectra,row.names=TRUE,quote=FALSE,sep="\t") 
+write.table(t.directory.aligned,file=alignedSpectra,row.names=TRUE,quote=FALSE,sep="\t")
 
 
 excludedZone <- NULL
@@ -164,7 +156,7 @@
     drawSpec(aligned.spectra[,(which(round(as.numeric(colnames(aligned.spectra)),2) == excludedZone[n])[1]):(which(round(as.numeric(colnames(aligned.spectra)),2) == excludedZone[n-1])[1])],xlab="", ylab="Aligned spectra", main="")
     n <- n - 2
   }
-  
+
   drawSpec(raw.spectra[,(which(round(as.numeric(colnames(raw.spectra)),2) == excludedZone[1])[1]):ncol(raw.spectra)],xlab="", ylab="Raw spectra", main="")
   drawSpec(aligned.spectra[,(which(round(as.numeric(colnames(aligned.spectra)),2) == excludedZone[1])[1]):ncol(aligned.spectra)],xlab="", ylab="Aligned spectra", main="")
 }
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/NmrAlignment_xml.xml
--- a/nmr_alignement/NmrAlignment_xml.xml Fri Mar 31 09:56:39 2017 -0400
+++ b/nmr_alignement/NmrAlignment_xml.xml Wed Apr 12 04:32:23 2017 -0400
b
b'@@ -1,59 +1,55 @@\n-<tool id="NmrAlignment" name="NMR spectra alignment" version="2.0.2">\r\n-\t<description>based on the Cluster-based Peak Alignment (CluPA) algorithm</description>\r\n-\t <requirements>\r\n-        <requirement type="package" version="3.1.2">R</requirement>\r\n-\t    <requirement type="package" version="1.1_4">r-batch</requirement>\r\n-\t    <requirement type="package" version="1.2.1">r-speaq</requirement>\r\n-  \t</requirements>\r\n+<tool id="NmrAlignment" name="NMR spectra alignment" version="2.0.3">\r\n+    <description>based on the Cluster-based Peak Alignment (CluPA) algorithm</description>\r\n+     <requirements>\r\n+        <requirement type="package" version="1.1_4">r-batch</requirement>\r\n+        <requirement type="package" version="1.2.1">r-speaq</requirement>\r\n+      </requirements>\r\n     <stdio>\r\n         <exit_code range="1:" level="fatal" />\r\n     </stdio>\r\n-  \t<command>\r\n-\t\t## Wrapper\r\n+    <command>\r\n+        ## Wrapper\r\n         Rscript \'$__tool_directory__/NmrAlignment_wrapper.R\'\r\n \r\n-\t\t## File input\r\n-        #if $inputs.input == "lib":\r\n-            library \'$__app__.config.user_library_import_dir/$__user_email__/$inputs.library\'\r\n-\t\t#elif $inputs.input == "tsv_file":\r\n+        ## File input\r\n+        #if $inputs.input == "tsv_file":\r\n             tsvfile $inputs.tsv_file\r\n         #elif $inputs.input == "zip_file":\r\n             zipfile \'$inputs.zip_file\'\r\n         #end if\r\n \r\n-\t\t## Spectra borders\r\n-\t\tleft_border $left_border\r\n-\t\tright_border $right_border\r\n+        ## Spectra borders\r\n+        left_border $left_border\r\n+        right_border $right_border\r\n \r\n-\t\t## Exclusion zone\r\n-\t\tzone_exclusion_choices.choice ${zone_exclusion_choices.choice}\r\n-\t\t#if str($zone_exclusion_choices.choice) == \'yes\':\r\n-\t\t\t#for $i in $zone_exclusion_choices.conditions:\r\n-\t\t\t\tzone_exclusion_left ${i.zone_exclusion_left}\r\n-\t\t\t\tzone_exclusion_right ${i.zone_exclusion_right}\r\n-\t\t\t#end for\r\n-\t\t#end if\r\n+        ## Exclusion zone\r\n+        zone_exclusion_choices.choice ${zone_exclusion_choices.choice}\r\n+        #if str($zone_exclusion_choices.choice) == \'yes\':\r\n+            #for $i in $zone_exclusion_choices.conditions:\r\n+                zone_exclusion_left ${i.zone_exclusion_left}\r\n+                zone_exclusion_right ${i.zone_exclusion_right}\r\n+            #end for\r\n+        #end if\r\n \r\n-\t\t## Reference spectrum\r\n-\t\treference $reference\r\n+        ## Reference spectrum\r\n+        reference $reference\r\n \r\n-\t\t## Segment size\r\n-\t\tnDivRange $nDivRange\r\n+        ## Segment size\r\n+        nDivRange $nDivRange\r\n \r\n-\t\t## Intensity threshold\r\n-\t\tbaselineThresh $baselineThresh\r\n+        ## Intensity threshold\r\n+        baselineThresh $baselineThresh\r\n \r\n-\t\t## Outputs\r\n-\t\tlogOut \'$logOut\'\r\n-\t\talignedSpectra \'$alignedSpectra\'\r\n-\t\tgraphOut \'$graphOut\'\r\n-\t</command>\r\n-  \t<inputs>\r\n+        ## Outputs\r\n+        logOut \'$logOut\'\r\n+        alignedSpectra \'$alignedSpectra\'\r\n+        graphOut \'$graphOut\'\r\n+    </command>\r\n+    <inputs>\r\n         <conditional name="inputs">\r\n             <param name="input" type="select" label="Choose your inputs method" >\r\n                 <option value="zip_file" selected="true">Zip file from your history containing your Bruker directories</option>\r\n                 <option value="tsv_file">Tsv file containing preprocessed spectra (from your history)</option>\r\n-                <option value="lib" >Library directory name</option>\r\n             </param>\r\n             <when value="zip_file">\r\n                 <param name="zip_file" type="data" format="no_unzip.zip" label="Zip file" />\r\n@@ -61,41 +57,58 @@\n             <when value="tsv_file">\r\n                 <param name="tsv_file" type="data" format="tabular" label="Tsv file" />\r\n             </when>\r\n-            <when value="lib">\r\n-                <param name="library" type="text" size="40" label="Library directory name" help="The name of your directory containing all your data" >\r\n-                    <validator type="empty_field"/>\r\n-                </param>\r\n-       '..b'p" />\r\n+            </conditional>\r\n+            <param name="left_border" value="9.3" />\r\n+            <param name="right_border" value="0.2" />\r\n+            <conditional name="zone_exclusion_choices">\r\n+                <param name="choice" value="yes" />\r\n+                <param name="conditions_0|zone_exclusion_left" value="6.0" />\r\n+                <param name="conditions_0|zone_exclusion_right" value="4.24" />\r\n+                <param name="conditions_1|zone_exclusion_left" value="4.0" />\r\n+                <param name="conditions_1|zone_exclusion_right" value="3.2" />\r\n+            </conditional>\r\n+            <param name="reference" value="0" />\r\n+            <param name="nDivRange" value="64" />\r\n+            <param name="baselineThresh" value="0" />\r\n+            <output name="alignedSpectra" value="MTBLS1_alignedSpectra.tabular" />\r\n+        </test>\r\n+    </tests>\r\n \r\n-\t<help>\r\n+    <help>\r\n \r\n .. class:: infomark\r\n \r\n@@ -177,49 +190,49 @@\n ----------\r\n \r\n Bucket width\r\n-\t| size of windows\r\n-\t|\r\n+    | size of windows\r\n+    |\r\n \r\n Left limit\r\n-\t| Upper boundary: values greater than this value are not used in the bucketing. Default value is 10.0 ppm\r\n-\t|\r\n+    | Upper boundary: values greater than this value are not used in the bucketing. Default value is 10.0 ppm\r\n+    |\r\n \r\n Right limit\r\n-\t| Lower boundary: values lower than this value are not used in the bucketing. Default value is 0.5 ppm\r\n-\t|\r\n+    | Lower boundary: values lower than this value are not used in the bucketing. Default value is 0.5 ppm\r\n+    |\r\n \r\n Exclusion zone(s)\r\n-\t| Spectral regions to exclude, water, solvents, ... resonance\r\n-\t| If YES: parameters **Lower exclusion zone** and **Upper exclusion zone** are visible,\r\n-\t| If NO: no zone to exclude\r\n-\t| Default value is NO\r\n-\t|\r\n+    | Spectral regions to exclude, water, solvents, ... resonance\r\n+    | If YES: parameters **Lower exclusion zone** and **Upper exclusion zone** are visible,\r\n+    | If NO: no zone to exclude\r\n+    | Default value is NO\r\n+    |\r\n \r\n Left exclusion zone\r\n-\t| Upper boundary of exclusion zone\r\n-\t|\r\n+    | Upper boundary of exclusion zone\r\n+    |\r\n \r\n Right exclusion zone\r\n-\t| Lower boundary of exclusion zone\r\n+    | Lower boundary of exclusion zone\r\n \r\n | *Notes:*\r\n | - these parameters can be used several times using the "Add new exclusion zones" button\r\n |\r\n \r\n Reference spectrum\r\n-\t| spectrum to which other spectra are aligned\r\n-\t| Default value is 0: heuristic strategy to find the optimal template developped in the speaq package\r\n-\t|\r\n+    | spectrum to which other spectra are aligned\r\n+    | Default value is 0: heuristic strategy to find the optimal template developped in the speaq package\r\n+    |\r\n \r\n Segment size\r\n-\t| Size of a single small segment after division of spectra\r\n-\t| Default value: 64 (minimal value adviced)\r\n-\t|\r\n+    | Size of a single small segment after division of spectra\r\n+    | Default value: 64 (minimal value adviced)\r\n+    |\r\n \r\n Intensity threshold\r\n-\t| All peaks with an intensity below this threshold are removed\r\n-\t| Default value: 1\r\n-\t|\r\n+    | All peaks with an intensity below this threshold are removed\r\n+    | Default value: 1\r\n+    |\r\n \r\n \r\n ------------\r\n@@ -227,13 +240,13 @@\n ------------\r\n \r\n alignedSpectra.tsv\r\n-\t| tabular output\r\n-\t| Data matrix with p rows (ppm) and n columns (samples) containing the aligned intensities\r\n-\t|\r\n+    | tabular output\r\n+    | Data matrix with p rows (ppm) and n columns (samples) containing the aligned intensities\r\n+    |\r\n \r\n graphOut.pdf\r\n-\t| pdf output\r\n-\t| Graphical chart of raw and aligned data: whole spectral width, "zoomed" zones depending on the exclusion zones, spectral zone between 2.8 and 2.4ppm corresponding to the citric acid\r\n+    | pdf output\r\n+    | Graphical chart of raw and aligned data: whole spectral width, "zoomed" zones depending on the exclusion zones, spectral zone between 2.8 and 2.4ppm corresponding to the citric acid\r\n \r\n \r\n ---------------------------------------------------\r\n'
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/test-data/MTBLS1.zip
b
Binary file nmr_alignement/test-data/MTBLS1.zip has changed
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/test-data/MTBLS1_alignedSpectra.tabular
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nmr_alignement/test-data/MTBLS1_alignedSpectra.tabular Wed Apr 12 04:32:23 2017 -0400
b
b'@@ -0,0 +1,29802 @@\n+ADG10003u_007\tADG10003u_009\tADG10003u_015\tADG10003u_017\tADG10003u_021\tADG10003u_023\tADG10003u_051\tADG10003u_053\tADG10003u_067\tADG10003u_071\tADG10003u_073\tADG10003u_087\tADG10003u_089\tADG10003u_097\r\n+9.2997\t-0.00172384578396177\t-0.000133260203713335\t0.00188546634303473\t0.00145955595536551\t0.00266060722603239\t-0.00456406825398832\t-0.00131195747929342\t0.000299817194153485\t0.000241533956195763\t-0.00349445210212112\t0.00449073847864704\t-0.00150200410788306\t-0.00479292634495511\t-0.00845701750085149\r\n+9.2994\t-0.002312062118707\t-0.000821498405692276\t0.00530663314770368\t0.0031937690024524\t-0.00295334219789086\t-0.00562040636826083\t0.000544476077311362\t0.000328645770514397\t0.00269356222036034\t-3.40676966964021e-05\t0.00203230500493516\t-0.000176706365633302\t-0.00197312886982787\t-0.00571063951344053\r\n+9.2991\t0.00293819295016693\t0.000917760076187904\t0.00843046810963003\t-0.000269595302370741\t0.00164391778956326\t-0.00116020450231351\t0.00180051068287967\t0.00190620953248653\t0.0037736553777559\t0.0093018774151955\t-0.000394479670034688\t-0.003086471186395\t0.00198994473348899\t-0.00300222608200099\r\n+9.2988\t-0.00452049127972714\t-0.00104938317666152\t0.00739844285463343\t-0.00723747846021565\t0.00239897800809775\t0.00247439274074376\t0.00110713566571126\t0.00128511387066643\t0.00345596457000934\t0.00696433078367433\t0.00224254345372155\t-0.00566245731651603\t0.000398110507158\t-0.00679345467506024\r\n+9.2985\t-0.00679644435394394\t0.00108834623376689\t0.00259733552669646\t-0.000234823010309861\t-0.00287387338820875\t0.00360433314397773\t0.00131195747929342\t0.000999710964693405\t0.000689024945235094\t0.00650078671387083\t0.0031892946618048\t-0.00307469076201945\t-0.00265731165999202\t-0.0097797246393341\r\n+9.2982\t-0.00277642443085087\t0.00566634173332424\t-0.00691481595689443\t-0.0028308607137917\t-0.00725637584172303\t-0.0016260295153459\t0.00171405323393041\t0.000538453742918813\t0.00428868693222166\t0.0079838484938265\t0.00181890167627456\t0.00292768088283286\t-0.00247963078733168\t-0.00681381248043622\r\n+9.2979\t0.0018982524688494\t0.00520336893713099\t-0.00477951684143076\t-0.00662236101521466\t-0.00714026189728136\t-0.00179792959811773\t0.00189382983412648\t-0.00159037646257698\t0.00846508420011296\t0.00553739693024306\t0.000491234569046061\t0.0065864843534735\t-0.000949387194169153\t-0.000196700416808458\r\n+9.2976\t0.00679969416794806\t0.00526852564607191\t0.000441679666812651\t-0.00120910742140804\t-0.00213479215285431\t-0.000118151042806551\t0.000152672876120703\t-0.00308433735310247\t0.00592967252184167\t-0.000913405212245339\t0.00251223643157335\t0.00205224809642454\t-0.00322256779992628\t0.00248695352160624\r\n+9.2973\t0.0142226304437968\t0.00623769076398707\t0.000127692305908127\t0.00213321409459558\t-0.00336112584864566\t0.000102171598492551\t-0.00158299472004702\t-0.00277298872840462\t0.00392207785486584\t0.00206109565013233\t0.00669824219090419\t-0.00475364666104364\t-0.000766236100799773\t0.00362478977883671\r\n+9.297\t0.0095699800612356\t0.0038963057105373\t0.00351092154143045\t-0.00115056672717896\t-0.00313273291572552\t0.00197273503440119\t0.00124299737120294\t-0.000204042257132233\t0.00372445916343294\t-0.00169081888112061\t0.00880017455307183\t-0.00277600791899761\t0.00325660472878254\t-0.00132985988091201\r\n+9.2967\t0.00329603358106473\t0.00164692585915988\t-0.00187004456695887\t0.00352938764417924\t-0.00634216495071527\t0.00176403380714863\t0.00254534846727977\t-0.000827380141558176\t0.00593828880796603\t0.000819579424622461\t0.00804286401174449\t-0.00315985341323439\t0.00436989594345592\t-0.00604406735284172\r\n+9.2964\t0.00459126500692792\t0.00211219059988875\t-0.0050096097404826\t0.00286563300585258\t-0.00620346737671246\t0.00252983657025749\t0.000727340443541328\t-0.00440212361031127\t0.00549691260262785\t0.00261260139583228\t0.00773247972122436\t0.0021570447882654\t0.000121155258666913\t-0.000861080146308356\r\n+9.2961\t-0.000111938037919595\t0.00239344493647291\t-0.00924072822465575\t0.00409058602870609\t-0.00303387627311829\t-0.00573516783197047\t0.00190686706849184\t-0.00350107044027521\t0.00336757815105623\t0.00231464867144653\t0.0069998100303461'..b'77632683724\t-0.00376535913578589\t-0.00189051397424559\t-0.00680797781709899\t0.00220797768670862\t0.000364413311229752\t0.00462651624799079\t0.00499289330198562\t-0.0113395726998991\r\n+0.2037\t-0.00173576176864353\t0.000437761406301544\t0.000580167215973881\t0.00201899371750953\t0.00560137929048828\t-0.0079577632683724\t-0.00376535913578589\t-0.00127838720284889\t-0.00680797781709899\t-0.00129066306664566\t-0.00171378245188136\t-0.000434157723340709\t0.00830663144706259\t-0.00234747504423297\r\n+0.2034\t-0.00247527499980266\t0.000416806484833108\t-0.00300200293092705\t0.00609923608971649\t0.00340480173600446\t-0.0079577632683724\t-0.00376535913578589\t0.00338543581731644\t-0.00680797781709899\t-7.53957221969555e-06\t-0.00361949226184836\t0.00424659756187919\t0.00552958273377266\t0.00552741926505671\r\n+0.2031\t0.00054344111957739\t-0.00068660109873922\t0.00441371231291134\t0.00608933258881308\t0.00585129058742422\t-0.0079577632683724\t-0.00376535913578589\t0.00275184777240662\t-0.00680797781709899\t0.00633435763820644\t-0.00334233921000737\t0.00861222649505304\t0.00292555507550204\t0.00768149515821787\r\n+0.2028\t8.88282494458724e-05\t-0.00183519273172786\t0.0110009697459545\t0.00410885248592794\t0.0110917579111525\t-0.0079577632683724\t-0.0011345824749015\t0.00165508060063147\t-0.00738054392729838\t0.00380245758946646\t-0.00781250596947208\t0.00850792065422783\t0.00171359728729891\t0.000210180585233094\r\n+0.2025\t0.00254316000344422\t-0.0030761169874368\t0.00813837967075322\t0.00410885248592794\t0.0103098530008755\t-0.0079577632683724\t0.00219162771384057\t0.00228354356529936\t-0.00133941557526741\t-0.00210186518880179\t-0.00742752093906001\t0.00598911866742981\t0.0043536878820958\t0.004245152631848\r\n+0.2022\t0.00234564353008287\t-0.0045118565286726\t-0.00333850608490233\t0.00410885248592794\t0.0111906145537597\t-0.0079577632683724\t0.00279820219694485\t0.00318267483024469\t-0.0019044771781972\t-0.00718297837804551\t-0.00844050856165338\t0.00561705359756858\t0.00229810050009832\t0.00193399151071813\r\n+0.2019\t-0.000822564033486575\t-0.0040515030976629\t-0.00796658108526813\t0.00410885248592794\t0.0111910406599779\t-0.0038357929737381\t0.00141728460956096\t1.28127006048498e-05\t0.000142307693408781\t-0.0043810499464742\t-0.00639260522019536\t0.00376237303494238\t0.00180395722938159\t-0.00401076276454617\r\n+0.2016\t-0.00322453767297415\t-0.00410487266327783\t-0.00458643620496098\t0.00410885248592794\t0.011761383832951\t-0.000322736352584289\t0.00112291758099565\t-0.000356513394329946\t0.00264936901088379\t-0.00804193112425971\t-0.00513162665317331\t0.00391821823241064\t-0.00198893172965399\t-0.00319700076046307\r\n+0.2013\t-0.00509715272023551\t0.00140921846875231\t0.00132164620970126\t-0.00839068612096886\t0.0126843299014305\t0.000420792033602021\t0.0003677872431492\t0.000191870191557626\t0.00253318812056178\t-0.00941497099849093\t-0.00805778415972288\t0.00426009596480952\t-0.00233902585503262\t0.000656676776114392\r\n+0.201\t0.000761178657853248\t0.00155000934736837\t0.00579704562691605\t-0.00447396155256717\t0.00786613383987363\t-0.00118828958625933\t0.00191750270705306\t-0.000602517245943062\t0.00493796578339922\t-0.00887212179867285\t-0.00843078785918261\t-0.0009743392660614\t-0.000338140680125548\t0.00136672401497122\r\n+0.2007\t0.00609592889083422\t0.00516571556261739\t0.00594756216141645\t-0.00749474940590659\t0.00803891991132721\t0.00248480359082712\t-0.0030404202880487\t-0.00130433292157371\t0.00596802889233075\t-0.00572141834108675\t-0.00758938193834072\t-0.00445790892411569\t0.00262611114187379\t0.00898632044062698\r\n+0.2004\t0.00381564273127859\t0.00426530878077054\t0.00435325895069397\t-0.00396602199512091\t0.00999751714298286\t0.00384741438778465\t-0.00201699739036767\t-0.00225087117875699\t0.00396905051147928\t-0.00392727939621475\t-0.00596308580869628\t-0.00598543728481245\t0.00439076382245708\t0.000253097039809485\r\n+0.2001\t0.00347693989396059\t0.00341008604834\t0.0123071941795799\t0.00155969135338893\t0.00947255428224105\t0.00357649017282454\t0.0018327606836782\t-0.0032220738846046\t0.00134108324354955\t0.00179022953705438\t-0.00319313773022348\t-0.00350001316707849\t0.0046579942341321\t-0.00175132147329041\r\n'
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/test-data/MTBLS1_bucketedData.tabular
--- a/nmr_alignement/test-data/MTBLS1_bucketedData.tabular Fri Mar 31 09:56:39 2017 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
b
b'@@ -1,595 +0,0 @@\n-Bucket\tADG10003u_007\tADG10003u_008\tADG10003u_009\tADG10003u_010\tADG10003u_015\tADG10003u_016\tADG10003u_017\tADG10003u_021\tADG10003u_022\tADG10003u_023\tADG10003u_051\tADG10003u_052\tADG10003u_053\tADG10003u_066\tADG10003u_067\tADG10003u_071\tADG10003u_072\tADG10003u_073\tADG10003u_087\tADG10003u_088\tADG10003u_089\tADG10003u_097\tADG10003u_098\r\n-B9.295\t1.79949423217956e-06\t1.36845276225836e-05\t2.01160697683997e-05\t7.25986492795804e-07\t2.42490464839257e-05\t3.11580892214512e-05\t8.19866824235026e-06\t3.09192259268499e-05\t2.64389193821353e-05\t1.45055826888266e-05\t3.45040700032625e-06\t1.60970199365859e-05\t1.05993065753594e-05\t2.90248760646802e-05\t1.06130409475137e-05\t5.2278556041205e-06\t2.44519080406605e-05\t3.7420635381202e-05\t1.57230624459948e-05\t2.75224138622866e-06\t2.08828714579133e-05\t5.49917968773367e-05\t8.22464110337308e-06\r\n-B9.286\t0.000183987136571742\t4.73741598311689e-05\t6.48220850387143e-05\t4.08486623139604e-05\t0.000124595459054319\t3.41874426311483e-05\t0.000122371178407348\t3.49547713922308e-05\t0.00015628757744243\t2.37737814473545e-05\t5.13987818577577e-05\t0.000134108924379129\t9.59219627606648e-05\t8.44451844992086e-05\t0.00022720535031565\t9.86157895513715e-05\t1.06199525078497e-05\t3.70983827911379e-05\t3.16119098225048e-05\t5.1709215131723e-06\t2.21703993321988e-05\t1.19479684646357e-05\t8.95607890845055e-06\r\n-B9.276\t6.1185692617288e-05\t0.00020732837726723\t0.00012538786536446\t2.84181782334477e-05\t2.53083682825459e-05\t2.76930477756038e-05\t9.7914592965261e-05\t1.44908072132008e-05\t7.76504143484867e-05\t2.21918164602678e-05\t0.000443221195814841\t0.00034996670727668\t0.000412632862820386\t0.000146364982064243\t0.000101892447453022\t0.00020898968160112\t0.00018589786110267\t0.000307514987819811\t0.000357112398084273\t0.000316352014982079\t0.00021198645013364\t0.000691068949900525\t0.000221146831632783\r\n-B9.266\t4.50617404358542e-05\t7.7187909059995e-06\t1.52411037411529e-05\t1.10253427920853e-05\t4.1745051441984e-05\t3.63488304424524e-05\t3.3290398209022e-05\t1.13169550474572e-05\t9.45184418976979e-06\t7.6012521812347e-06\t6.92482995870393e-06\t3.8268420757911e-05\t2.37195119946984e-06\t2.86004474506151e-05\t3.22860579421692e-06\t2.96039906990133e-06\t2.52808779783966e-05\t0.000142090898957934\t1.10312630129144e-05\t3.60677293639806e-06\t2.97265975382987e-05\t6.66305467846902e-06\t1.14495101906091e-05\r\n-B9.255\t1.15660880406503e-05\t2.14664012391468e-05\t4.60009639329725e-06\t1.25395676678615e-05\t4.17248489153109e-05\t1.46532714803481e-05\t1.00057270405122e-05\t2.75328532847705e-05\t2.74077840472564e-05\t2.41894891121703e-06\t8.0400281246103e-06\t1.59037103857697e-05\t1.00611731499731e-06\t6.71681516896861e-06\t1.36105357122668e-05\t7.11442411954162e-06\t2.21537557041547e-05\t2.87845824558775e-05\t4.03717597605331e-05\t1.42618582461408e-05\t1.84330229833385e-05\t6.39363012853215e-05\t2.18920831381193e-05\r\n-B9.246\t2.03293920474837e-07\t2.02423815996018e-05\t4.96598896737477e-06\t1.35705313106542e-05\t3.41075710581766e-05\t6.53017072634504e-05\t4.43984949390479e-06\t1.63183767828055e-05\t2.72484433555238e-06\t8.78724169594538e-06\t8.95623692386308e-07\t2.45735590368271e-05\t5.26105502709834e-06\t2.37539064007069e-05\t2.19035721346259e-05\t1.50517785846819e-05\t2.16082826646081e-05\t2.53649297518041e-05\t1.32773972605395e-05\t1.00977058894297e-05\t1.55783781762885e-05\t3.76630403674761e-05\t2.14582962168246e-05\r\n-B9.236\t3.37742336734625e-05\t1.09466424044581e-05\t1.26844396116922e-05\t1.41040509503652e-05\t8.32806751647478e-06\t6.89331798338183e-05\t1.31306116922384e-05\t2.44043814312157e-05\t2.60353424850613e-06\t1.5498729364209e-05\t1.12441000124573e-05\t1.90904945628191e-05\t4.77289113406423e-06\t2.6783614160707e-05\t1.81281101162131e-05\t2.27290178082349e-05\t2.2060579242685e-05\t2.02102446881195e-05\t2.82836945109232e-05\t2.6769889759727e-05\t3.20529608453921e-05\t1.46895321061598e-05\t2.72459848898296e-05\r\n-B9.226\t1.02347475703096e-05\t1.61525191983677e-05\t6.32740402153627e-06\t2.17291460045977e-06\t3.58860102752402e-05\t5.32064617047859e-05\t3.88074184844747e-06\t1.41925328605111e-05\t3.61825110992116e-05\t1.56626397248238e-05\t1.488989398'..b'2263392642444\t0.00538943800528357\t0.00514775819006039\t0.00559553789396426\t0.0173520429506117\t0.028324033261543\r\n-B0.876\t0.00215863677466562\t0.00369895246404019\t0.00360045348807487\t0.00134769212206423\t0.00218354336599731\t0.00245532683379321\t0.00345022433982449\t0.000717888096909645\t0.00170401747506495\t0.000356847987108017\t0.0041628951177036\t0.005088145578844\t0.00284987245949532\t0.00268286392210182\t0.00197915272339639\t0.0164744229799929\t0.00871859567919084\t0.0291624658349522\t0.00450433606743076\t0.00467317787458834\t0.00464469278467577\t0.0176322957897126\t0.0298903125539951\r\n-B0.866\t0.00150013418482023\t0.00258508360037412\t0.00238111738536749\t0.000983712268869988\t0.00157378746779101\t0.00184741600638927\t0.00259613706860757\t0.000530590445564721\t0.00114218607490948\t0.000297719443003154\t0.00236377135640083\t0.00299039447289031\t0.00169838032153178\t0.00202478720109677\t0.00155237208983581\t0.00506508824735588\t0.00335278099612616\t0.00916049409218431\t0.00304824370929634\t0.0028945285734165\t0.0028543532645478\t0.00397438831823791\t0.00746021084696681\r\n-B0.857\t0.000986962374512856\t0.00174301185204418\t0.00155459274530862\t0.00059744100374567\t0.000946611593982685\t0.00119641009019251\t0.00173321235334005\t0.000356899004924163\t0.000758730491964375\t0.000160811437925477\t0.00152510957100737\t0.00196835887814581\t0.00101457930295155\t0.00150335976451684\t0.00101420955937978\t0.0033735623219071\t0.00210956426055451\t0.00493276854725743\t0.00178283936255044\t0.00165275426730159\t0.00170372495712446\t0.00248870525573775\t0.0039846322834038\r\n-B0.846\t0.000839825601114667\t0.0012769784113784\t0.00110091918664795\t0.000413961172391942\t0.000708888771217311\t0.000778154520699405\t0.00111234240481985\t0.000244663266226838\t0.000484525523691875\t7.68758960306947e-05\t0.000909219126236251\t0.00113056799032888\t0.000631562997579227\t0.00107030332221529\t0.000634580995745331\t0.00106135884542878\t0.000970558123349218\t0.00157698752726719\t0.00109118524592164\t0.0010809000005087\t0.00117405624971632\t0.00104182637112804\t0.00136932315987551\r\n-B0.836\t0.000540291147081289\t0.00110805916107828\t0.000991944918364915\t0.000259305489167024\t0.000414200683547401\t0.000446851710747917\t0.000739324952553648\t0.00014512091218808\t0.000240131270356258\t1.53279187890163e-05\t0.000995779500719967\t0.00117589795062701\t0.000663607401633198\t0.00072607607121414\t0.000348533637762843\t0.000814771690737036\t0.000852228105038011\t0.00106417265964175\t0.00106436355116083\t0.00088998568772594\t0.00115577335390134\t0.000793475313473202\t0.000969704476916626\r\n-B0.826\t0.000439210376659004\t0.000622025753244184\t0.0005877341421479\t0.000201776175879904\t0.000325527630159852\t0.000344597178120722\t0.000468730496980652\t0.000169188243600758\t0.000244354283493434\t1.80591932027473e-05\t0.000645393534597378\t0.00076364124043746\t0.000411619698520102\t0.000416731585656504\t0.000256480294202034\t0.000524752271786902\t0.000676304092825243\t0.000814916554483356\t0.000597779964300897\t0.000807012376046873\t0.000712066733726576\t0.000508127245813254\t0.000691958647587166\r\n-B0.816\t0.000394076959769821\t0.000626251816952311\t0.000644546372165628\t0.000163741793970591\t0.000294493619073591\t0.000396363737760121\t0.000520046367222883\t0.00012853568638618\t0.000243131055493038\t1.18743008584546e-05\t0.000604929046893319\t0.000717510278393041\t0.000373029125568352\t0.000391937364448496\t0.000234261393789731\t0.000523235700797077\t0.000619868853421147\t0.000730622691788109\t0.000640770168804395\t0.000676985988978989\t0.000745527871203007\t0.00061791716531139\t0.000781012740687151\r\n-B0.806\t0.000336785447055572\t0.000470318285990568\t0.000447571911175899\t0.00015477142985862\t0.000254766661248894\t0.000300355488014835\t0.000386815449880438\t0.000128859420585409\t0.000182934749398549\t1.11417886043334e-05\t0.0003939533156056\t0.000417332638774188\t0.000210616293653824\t0.000296880999894829\t0.000120837576055159\t0.00033047173709954\t0.000388172417071423\t0.000450376987152908\t0.000452051328977898\t0.000485123182275246\t0.00047918667429437\t0.000397128925502763\t0.000516124725384787\r\n-B0.8\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\r\n'
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/test-data/MTBLS1_sampleMetadata.tabular
--- a/nmr_alignement/test-data/MTBLS1_sampleMetadata.tabular Fri Mar 31 09:56:39 2017 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
b
@@ -1,24 +0,0 @@
-Sample SampleOrder
-ADG10003u_007 1
-ADG10003u_008 2
-ADG10003u_009 3
-ADG10003u_010 4
-ADG10003u_015 5
-ADG10003u_016 6
-ADG10003u_017 7
-ADG10003u_021 8
-ADG10003u_022 9
-ADG10003u_023 10
-ADG10003u_051 11
-ADG10003u_052 12
-ADG10003u_053 13
-ADG10003u_066 14
-ADG10003u_067 15
-ADG10003u_071 16
-ADG10003u_072 17
-ADG10003u_073 18
-ADG10003u_087 19
-ADG10003u_088 20
-ADG10003u_089 21
-ADG10003u_097 22
-ADG10003u_098 23
b
diff -r 908e1345d7ca -r f3ec6799c435 nmr_alignement/test-data/MTBLS1_variableMetadata.tabular
--- a/nmr_alignement/test-data/MTBLS1_variableMetadata.tabular Fri Mar 31 09:56:39 2017 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
b
@@ -1,595 +0,0 @@
-Bucket VariableOrder
-B9.295 1
-B9.286 2
-B9.276 3
-B9.266 4
-B9.255 5
-B9.246 6
-B9.236 7
-B9.226 8
-B9.215 9
-B9.206 10
-B9.196 11
-B9.186 12
-B9.175 13
-B9.165 14
-B9.156 15
-B9.146 16
-B9.135 17
-B9.126 18
-B9.116 19
-B9.106 20
-B9.095 21
-B9.085 22
-B9.076 23
-B9.066 24
-B9.055 25
-B9.046 26
-B9.036 27
-B9.026 28
-B9.015 29
-B9.005 30
-B8.996 31
-B8.986 32
-B8.975 33
-B8.966 34
-B8.956 35
-B8.946 36
-B8.935 37
-B8.925 38
-B8.916 39
-B8.905 40
-B8.895 41
-B8.886 42
-B8.876 43
-B8.865 44
-B8.855 45
-B8.845 46
-B8.836 47
-B8.825 48
-B8.815 49
-B8.806 50
-B8.796 51
-B8.785 52
-B8.775 53
-B8.765 54
-B8.756 55
-B8.745 56
-B8.735 57
-B8.726 58
-B8.716 59
-B8.705 60
-B8.695 61
-B8.685 62
-B8.676 63
-B8.665 64
-B8.655 65
-B8.646 66
-B8.636 67
-B8.625 68
-B8.615 69
-B8.605 70
-B8.596 71
-B8.585 72
-B8.575 73
-B8.565 74
-B8.556 75
-B8.545 76
-B8.535 77
-B8.525 78
-B8.516 79
-B8.505 80
-B8.495 81
-B8.485 82
-B8.476 83
-B8.465 84
-B8.455 85
-B8.445 86
-B8.436 87
-B8.425 88
-B8.415 89
-B8.405 90
-B8.396 91
-B8.385 92
-B8.375 93
-B8.365 94
-B8.356 95
-B8.345 96
-B8.335 97
-B8.325 98
-B8.316 99
-B8.305 100
-B8.295 101
-B8.285 102
-B8.276 103
-B8.265 104
-B8.255 105
-B8.245 106
-B8.236 107
-B8.225 108
-B8.215 109
-B8.205 110
-B8.196 111
-B8.185 112
-B8.175 113
-B8.165 114
-B8.156 115
-B8.145 116
-B8.135 117
-B8.125 118
-B8.116 119
-B8.105 120
-B8.096 121
-B8.086 122
-B8.076 123
-B8.065 124
-B8.056 125
-B8.046 126
-B8.036 127
-B8.025 128
-B8.016 129
-B8.006 130
-B7.996 131
-B7.985 132
-B7.976 133
-B7.966 134
-B7.956 135
-B7.945 136
-B7.936 137
-B7.926 138
-B7.916 139
-B7.905 140
-B7.896 141
-B7.886 142
-B7.876 143
-B7.865 144
-B7.856 145
-B7.846 146
-B7.836 147
-B7.825 148
-B7.816 149
-B7.806 150
-B7.796 151
-B7.785 152
-B7.776 153
-B7.766 154
-B7.756 155
-B7.745 156
-B7.736 157
-B7.726 158
-B7.716 159
-B7.705 160
-B7.696 161
-B7.686 162
-B7.676 163
-B7.665 164
-B7.656 165
-B7.646 166
-B7.636 167
-B7.625 168
-B7.616 169
-B7.606 170
-B7.596 171
-B7.585 172
-B7.575 173
-B7.566 174
-B7.556 175
-B7.545 176
-B7.535 177
-B7.526 178
-B7.516 179
-B7.505 180
-B7.495 181
-B7.486 182
-B7.476 183
-B7.465 184
-B7.455 185
-B7.446 186
-B7.436 187
-B7.425 188
-B7.415 189
-B7.406 190
-B7.396 191
-B7.385 192
-B7.375 193
-B7.366 194
-B7.356 195
-B7.345 196
-B7.335 197
-B7.326 198
-B7.316 199
-B7.305 200
-B7.295 201
-B7.286 202
-B7.275 203
-B7.265 204
-B7.255 205
-B7.246 206
-B7.235 207
-B7.225 208
-B7.216 209
-B7.206 210
-B7.195 211
-B7.185 212
-B7.175 213
-B7.166 214
-B7.155 215
-B7.145 216
-B7.136 217
-B7.126 218
-B7.115 219
-B7.105 220
-B7.096 221
-B7.086 222
-B7.075 223
-B7.065 224
-B7.056 225
-B7.046 226
-B7.035 227
-B7.025 228
-B7.016 229
-B7.006 230
-B6.995 231
-B6.985 232
-B6.976 233
-B6.966 234
-B6.955 235
-B6.945 236
-B6.935 237
-B6.926 238
-B6.915 239
-B6.905 240
-B6.895 241
-B6.886 242
-B6.875 243
-B6.865 244
-B6.855 245
-B6.846 246
-B6.835 247
-B6.825 248
-B6.815 249
-B6.806 250
-B6.795 251
-B6.785 252
-B6.775 253
-B6.766 254
-B6.755 255
-B6.745 256
-B6.735 257
-B6.726 258
-B6.715 259
-B6.705 260
-B6.695 261
-B6.686 262
-B6.675 263
-B6.665 264
-B6.655 265
-B6.646 266
-B6.635 267
-B6.625 268
-B6.615 269
-B6.606 270
-B6.595 271
-B6.585 272
-B6.575 273
-B6.566 274
-B6.555 275
-B6.545 276
-B6.535 277
-B6.526 278
-B6.515 279
-B6.505 280
-B6.495 281
-B6.486 282
-B6.475 283
-B6.466 284
-B6.456 285
-B6.446 286
-B6.435 287
-B6.426 288
-B6.416 289
-B6.406 290
-B6.395 291
-B6.386 292
-B6.376 293
-B6.366 294
-B6.355 295
-B6.346 296
-B6.336 297
-B6.326 298
-B6.315 299
-B6.306 300
-B6.296 301
-B6.286 302
-B6.275 303
-B6.266 304
-B6.256 305
-B6.246 306
-B6.235 307
-B6.226 308
-B6.216 309
-B6.206 310
-B6.195 311
-B6.186 312
-B6.176 313
-B6.166 314
-B6.155 315
-B6.146 316
-B6.136 317
-B6.126 318
-B6.115 319
-B6.106 320
-B6.096 321
-B6.086 322
-B6.075 323
-B6.066 324
-B6.056 325
-B6.046 326
-B6.035 327
-B6.026 328
-B6.016 329
-B6.006 330
-B4.236 331
-B4.226 332
-B4.216 333
-B4.205 334
-B4.196 335
-B4.186 336
-B4.176 337
-B4.165 338
-B4.155 339
-B4.146 340
-B4.136 341
-B4.125 342
-B4.115 343
-B4.106 344
-B4.096 345
-B4.085 346
-B4.075 347
-B4.066 348
-B4.056 349
-B4.045 350
-B4.035 351
-B4.026 352
-B4.015 353
-B4.005 354
-B3.995 355
-B3.186 356
-B3.175 357
-B3.166 358
-B3.156 359
-B3.146 360
-B3.135 361
-B3.126 362
-B3.116 363
-B3.106 364
-B3.095 365
-B3.086 366
-B3.076 367
-B3.066 368
-B3.055 369
-B3.046 370
-B3.036 371
-B3.026 372
-B3.015 373
-B3.006 374
-B2.996 375
-B2.986 376
-B2.975 377
-B2.966 378
-B2.956 379
-B2.946 380
-B2.935 381
-B2.926 382
-B2.916 383
-B2.906 384
-B2.895 385
-B2.886 386
-B2.876 387
-B2.866 388
-B2.855 389
-B2.846 390
-B2.836 391
-B2.826 392
-B2.815 393
-B2.806 394
-B2.796 395
-B2.786 396
-B2.775 397
-B2.766 398
-B2.756 399
-B2.746 400
-B2.735 401
-B2.726 402
-B2.716 403
-B2.706 404
-B2.695 405
-B2.686 406
-B2.676 407
-B2.666 408
-B2.655 409
-B2.646 410
-B2.636 411
-B2.626 412
-B2.615 413
-B2.606 414
-B2.596 415
-B2.586 416
-B2.575 417
-B2.566 418
-B2.556 419
-B2.546 420
-B2.535 421
-B2.526 422
-B2.516 423
-B2.506 424
-B2.495 425
-B2.486 426
-B2.476 427
-B2.466 428
-B2.455 429
-B2.446 430
-B2.436 431
-B2.426 432
-B2.415 433
-B2.406 434
-B2.396 435
-B2.385 436
-B2.375 437
-B2.365 438
-B2.356 439
-B2.345 440
-B2.335 441
-B2.325 442
-B2.316 443
-B2.305 444
-B2.295 445
-B2.285 446
-B2.276 447
-B2.265 448
-B2.255 449
-B2.245 450
-B2.236 451
-B2.225 452
-B2.215 453
-B2.205 454
-B2.196 455
-B2.185 456
-B2.175 457
-B2.165 458
-B2.156 459
-B2.145 460
-B2.135 461
-B2.126 462
-B2.116 463
-B2.105 464
-B2.095 465
-B2.086 466
-B2.076 467
-B2.065 468
-B2.055 469
-B2.045 470
-B2.036 471
-B2.025 472
-B2.015 473
-B2.005 474
-B1.994 475
-B1.985 476
-B1.974 477
-B1.964 478
-B1.954 479
-B1.945 480
-B1.934 481
-B1.924 482
-B1.914 483
-B1.905 484
-B1.894 485
-B1.884 486
-B1.874 487
-B1.865 488
-B1.854 489
-B1.844 490
-B1.834 491
-B1.825 492
-B1.814 493
-B1.804 494
-B1.794 495
-B1.785 496
-B1.774 497
-B1.764 498
-B1.754 499
-B1.743 500
-B1.734 501
-B1.723 502
-B1.713 503
-B1.703 504
-B1.694 505
-B1.683 506
-B1.673 507
-B1.663 508
-B1.654 509
-B1.643 510
-B1.633 511
-B1.623 512
-B1.612 513
-B1.603 514
-B1.592 515
-B1.582 516
-B1.572 517
-B1.563 518
-B1.552 519
-B1.542 520
-B1.532 521
-B1.523 522
-B1.512 523
-B1.502 524
-B1.491 525
-B1.482 526
-B1.472 527
-B1.461 528
-B1.451 529
-B1.442 530
-B1.432 531
-B1.421 532
-B1.411 533
-B1.401 534
-B1.392 535
-B1.381 536
-B1.371 537
-B1.36 538
-B1.351 539
-B1.341 540
-B1.33 541
-B1.32 542
-B1.31 543
-B1.301 544
-B1.29 545
-B1.28 546
-B1.27 547
-B1.261 548
-B1.25 549
-B1.239 550
-B1.229 551
-B1.22 552
-B1.21 553
-B1.199 554
-B1.189 555
-B1.18 556
-B1.17 557
-B1.159 558
-B1.149 559
-B1.139 560
-B1.129 561
-B1.119 562
-B1.108 563
-B1.098 564
-B1.089 565
-B1.079 566
-B1.068 567
-B1.058 568
-B1.048 569
-B1.039 570
-B1.028 571
-B1.018 572
-B1.008 573
-B0.998 574
-B0.988 575
-B0.977 576
-B0.967 577
-B0.958 578
-B0.948 579
-B0.937 580
-B0.926 581
-B0.916 582
-B0.907 583
-B0.897 584
-B0.886 585
-B0.876 586
-B0.866 587
-B0.857 588
-B0.846 589
-B0.836 590
-B0.826 591
-B0.816 592
-B0.806 593
-B0.8 594