# HG changeset patch
# User galaxyp
# Date 1551718182 18000
# Node ID e8822850243ad803bdfaf55ec900376ce32c8696
# Parent  6caa9011f24544359e15287b1b89cd8a684b95e7
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/dia_umpire commit 2379480213ba2e084a93bf82052fac858ffd074f

diff -r 6caa9011f245 -r e8822850243a datatypes_conf.xml
--- a/datatypes_conf.xml	Mon Mar 04 11:49:18 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-  <datatypes>
-   <registration>
-        <datatype extension="dia_umpire.ser" type="galaxy.datatypes.data:Text" subclass="True"/>
-   </registration>
-</datatypes>
-
diff -r 6caa9011f245 -r e8822850243a dia_umpire_quant.xml
--- a/dia_umpire_quant.xml	Mon Mar 04 11:49:18 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,443 +0,0 @@
-<tool id="dia_umpire_quant" name="DIA_Umpire_Quant" version="@VERSION@.0">
-    <description>DIA quantitation and targeted re-extraction</description>
-    <macros>
-        <import>dia_umpire_macros.xml</import>
-    </macros>
-    <expand macro="requirements" />
-    <expand macro="stdio" />
-    <command>
-<![CDATA[
-#import shutil
-###  $shutil.copytree($se_input.extra_files_path.__str__,$work_path.__str__)
-## want to save all outputs in a directory output.extra_files_path to be used by 
-## Is file naming going to be a problem? May need to have a name param
-cat $quant_params > $dia_umpire_quant && echo "Thread = \$GALAXY_SLOTS" >> $dia_umpire_quant 
-&& cp -rp $se_input.extra_files_path.__str__ $work_path.__str__
-&& ln -s $protxml_input ${work_path}/$interact_prot_xml
-&& ln -s $searchdb_input ${work_path}/$searchdb_fa
-#for $input in $mzxml_inputs:
-&& ln -s $input ${work_path}/${input.name}
-#end for
-#for $input in $pepxml_inputs:
-&& ln -s $input ${work_path}/${input.name}
-#end for
-## Make sure pep.xml and prot.xml start with "interact-"
-## && echo "# $quant_params" >> $dia_umpire_quant 
-&& java -jar \$DIA_UMPIRE_QUANT_JAR $quant_params 
-&& cp $work_path/ProtSummary*.xls "$ProtSummary"
-&& cp $work_path/PeptideSummary*.xls "$PeptideSummary"
-&& cp $work_path/FragSummary*.xls "$FragSummary"
-&& cp $work_path/IDNoSummary*.xls "$IDNoSummary"
-&& cat $work_path/*.log "$logfile"
-]]>
-    </command>
-
-  <configfiles>
-    <configfile name="user_mods"><![CDATA[
-<?xml version="1.0"?>
-<MSModSpecSet
-    xmlns="http://www.ncbi.nlm.nih.gov"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-    xs:schemaLocation="http://www.ncbi.nlm.nih.gov OMSSA.xsd"
->
-  <MSModSpec>
-        <MSModSpec_mod>
-            <MSMod value="modificationwithneutrallosses">1</MSMod>
-        </MSModSpec_mod>
-        <MSModSpec_type>
-            <MSModType value="modaa">0</MSModType>
-        </MSModSpec_type>
-        <MSModSpec_name>test modification with neutral losses</MSModSpec_name>
-        <MSModSpec_monomass>123.456789</MSModSpec_monomass>
-        <MSModSpec_averagemass>0</MSModSpec_averagemass>
-        <MSModSpec_n15mass>0</MSModSpec_n15mass>
-        <MSModSpec_residues>
-            <MSModSpec_residues_E>B</MSModSpec_residues_E>
-            <MSModSpec_residues_E>O</MSModSpec_residues_E>
-        </MSModSpec_residues>
-        <MSModSpec_neutralloss>
-            <MSMassSet>
-                <MSMassSet_monomass>456.789123</MSMassSet_monomass>
-                <MSMassSet_averagemass>0</MSMassSet_averagemass>
-                <MSMassSet_n15mass>0</MSMassSet_n15mass>
-            </MSMassSet>
-            <MSMassSet>
-                <MSMassSet_monomass>789.123456</MSMassSet_monomass>
-                <MSMassSet_averagemass>0</MSMassSet_averagemass>
-                <MSMassSet_n15mass>0</MSMassSet_n15mass>
-            </MSMassSet>
-        </MSModSpec_neutralloss>
-        <MSModSpec_unimod>00</MSModSpec_unimod>
-        <MSModSpec_psi-ms>testMod</MSModSpec_psi-ms>
-    </MSModSpec>
-<MSModSpecSet
-]]>
-    </configfile>
-    <configfile name="quant_params"><![CDATA[
-#DIA-Umpire (version @VERSION@)
-#Data Independent Acquisition data processing and analysis package (Quantitation and targeted re-extraction module)
-
-#Working folder path: the program will process all mzXML files in the working folder (please make sure the corresponding pepXML files are in the same folder with mzXML file)
-#Internal spectral library file, output csv files will be stored in the working folder
-Path = ${work_path}/
-
-#Or you can specify all DIA mzXML files you want to analyze here (the working folder is still required for storing output files)
-#  ==File list begin
-#  ==File list end
-
-#No of threads
-Thread = 6
-
-InternalLibID = #if $InternalLibID then $InternalLibID else 'LibID'#
-
-#InternalLibSearch / TargetedExtraction both will work
-InternalLibSearch = $TargetedExtraction
-ExternalLibSearch = $external_settings.ExternalLibSearch
-#if $external_settings.ExternalLibSearch == 'true':
-ExternalLibPath = $external_settings.ExternalLibPath
-ExternalLibDecoyTag = $external_settings.ExternalLibDecoyTag
-ReSearchProb = $external_settings.ReSearchProb
-#end if
-
-#Fasta file path
-# Fasta = $searchdb_input
-Fasta = ${work_path}/$searchdb_fa
-
-#Combined prot.xml file
-Combined_Prot = ${work_path}/$interact_prot_xml
-
-#Decoy tag
-DecoyPrefix = $DecoyPrefix
-
-#FDR threshold
-#if $fdr_settings.advanced == 'yes':
-PeptideFDR = #if $fdr_settings.PeptideFDR then $fdr_settings.PeptideFDR else 0.01#
-ProteinFDR = #if $fdr_settings.ProteinFDR then $fdr_settings.ProteinFDR else 0.01#
-DataSetLevelPepFDR = false
-ProbThreshold = #if $fdr_settings.ProbThreshold then $fdr_settings.ProbThreshold else 0.99#
-#else
-PeptideFDR = 0.01
-ProteinFDR = 0.01
-ProbThreshold = 0.99
-#end if
-
-#UserMod path
-#if $usermod.mod_src == 'history':
-UserMod= $usermod.UserMods
-## #else if $usermod.mod_src == 'config':
-## UserMod= $user_mods
-#else:
-UserMod=
-#end if
-
-####Peptide-centric targeted re-extraction####
-#file format for external library: traML
-ExternalLibPath =
-ExternalLibDecoyTag= DECOY
-ReSearchProb=0.5
-
-####Peptide/Fragment selection for MS2-based quantitation####
-#if $quant_settings.advanced == 'yes':
-####Peptide filtering####
-#Use either peptide group weight (GW) or peptide weight (PepW) to filter non-unique peptide (computed by ProteinProphet),
-#Peptides with weight lower than threshold will be removed
-FilterWeight = #if $quant_settings.FilterWeight then $quant_settings.FilterWeight else GW#
-MinWeight = #if $quant_settings.MinWeight then $quant_settings.MinWeight else 0.9#
-####Peptide/Fragment selection for MS2-based quantitation####
-TopNFrag = #if $quant_settings.TopNFrag then $quant_settings.TopNFrag else 6#
-TopNPep = #if $quant_settings.TopNPep then $quant_settings.TopNPep else 6#
-Freq = #if $quant_settings.Freq then $quant_settings.Freq else 0.5#
-#else:
-####Peptide filtering####
-#Use either peptide group weight (GW) or peptide weight (PepW) to filter non-unique peptide (computed by ProteinProphet),
-#Peptides with weight lower than threshold will be removed
-FilterWeight = GW
-MinWeight = 0.9
-####Peptide/Fragment selection for MS2-based quantitation####
-TopNFrag = 6
-TopNPep = 6
-Freq = 0.5
-#end if
-]]>
-    </configfile>
-  </configfiles>
-
-    <inputs>
-        <param name="work_path" type="hidden" value="dia_output_dir"/>
-        <param name="interact_prot_xml" type="hidden" value="interact.prot.xml"/>
-        <param name="searchdb_fa" type="hidden" value="searchdb.fasta"/>
-        <param name="mzxml_inputs" type="data" format="mzxml" multiple="true" label="Proteomics Spectrum files in mzXML format"/>
-        <param name="pepxml_inputs" type="data" format="pepxml" multiple="true" label="PepXML"/>
-        <param name="protxml_input" type="data" format="protxml" label="ProtXML"/>
-        <param name="searchdb_input" type="data" format="fasta" label="Fasta Search Database"/>
-        <param name="se_input" type="data" format="dia_umpire.ser" label="DIA-Umpire SE Signal Extraction data"/> 
-        <param name="InternalLibID" type="text" value="" label="InternalLibID " >
-          <help>
-InternalLibID: Identifier for the internal spectral library.
-If you are processing the dataset for the first time, it will be used as the name for the new library, if you are reprocessing data (e.g. using different thresholds/FDR levels, etc.) first a library with that name will be looked up and used if found.
-Recommended value: you can use the same name for all analysis; however it is beneficial to provide unique meaningful names, to make the library more easily reusable.
-          </help>
-        </param>
-
-        <param name="TargetedExtraction" type="boolean" truevalue="true" falsevalue="false" checked="true" label="TargetedExtraction" >
-          <help>
-Whether to process targeted re-extraction across samples and replicates.
-          </help>
-        </param>
-
-        <param name="DecoyPrefix" type="text" value="REVERSED_" label="Decoy Prefix in Protein Search FASTA Database" >
-          <help>
-Typical values: if you are unsure what that prefix was, check protein names in the FASTA file. "rev_" and "DECOY_" are common choices.
-          </help>
-        </param>
-
-        <conditional name="usermod">
-          <param name="mod_src" type="select" label="User Modifications">
-            <help>
-            </help>
-            <option value="none">none</option>
-            <option value="history">From history dataset</option>
-            <!--
-            <option value="config">Build </option>
-            -->
-          </param>
-          <when value="none"/>
-          <when value="history">
-              <param name="UserMods" type="data" format="xml" label="User Modifications OMSSA XML"/>
-          </when>
-        </conditional>
-
-        <conditional name="external_settings">
-          <param name="ExternalLibSearch" type="select" label="Use ExternalLibSearch">
-            <help>
-ExternalLibSearch: Whether to process targeted extraction across samples and replicates to research unidentified peptide ions from specified external spectral library. Peptide ions in external library will be research if it satisfies the two conditions. (1) unidentified from initial database search, and (2) unidentified or identified but the probability was lower than the specified threswhold described below. 
-            </help>
-            <option value="false">no</option>
-            <option value="true">yes</option>
-          </param>
-          <when value="false"/>
-          <when value="true">
-            <param name="ExternalLibPath" type="data" format="dia_umpire.ser" label="DIA-Umpire ExternalLibPath">
-              <help>
-ExternalLibPath (new parameter in v1.4): File path of external spectral library file. Currently only traML and custom binary (.serFS) formats are supported, and a decoy spectrum for each forward peptide ion sequence is required in the library file. (Effective only when ExternalLibSearch is set as true)
-              </help>
-            </param>
-            <param name="ExternalLibDecoyTag" type="text" value="DECOY" label="Decoy tag of decoy spectra" >
-              <help>
-ExternalLibDecoyTag: Decoy tag of decoy spectra. (default: DECOY)
-              </help>
-            </param>
-            <param name="ReSearchProb" type="float" value="0.05" optional="true" min=".00" max="1." label="Probability threshold for re-search">
-              <help>
-ReSearchProb: Probability threshold to determine which peptide ion will be re-searched using external spectral library. (default: 0.5)
-              </help>
-            </param>
-          </when>
-        </conditional>
-<!--
--->
-
-        <conditional name="fdr_settings">
-          <param name="advanced" type="select" label="Advanced FDR Estimation Settings" help="Usually do not need to be changed">
-            <option value="no">no</option>
-            <option value="yes">yes</option>
-          </param>
-          <when value="no"/>
-          <when value="yes">
-            <param name="PeptideFDR" type="float" value=".01" optional="true" min=".01" max=".1" label="PeptideFDR" >
-              <help>
-PeptideFDR: Target peptide level FDR.
-DIA-Umpire estimates peptide level FDR by target-decoy approach according to peptide ion's maximum PeptideProphet probability. (default: 0.01)
-Recommended value: 0.01 or 0.05 are the standard thresholds used in proteomics studies, corresponding to 1% and 5% FDR.
-              </help>
-            </param>
-            <param name="ProteinFDR" type="float" value=".01" optional="true" min=".01" max=".1" label="ProteinFDR" >
-              <help>
-ProteinFDR: Target protein level FDR.
-DIA-Umpire fist removes protein identifications with low protein group probability (&lt;0.5) and estimates protein level FDR of the remaining list by target-decoy approach according to the maximum peptide ion probability. (default: 0.01)
-Recommended value: 0.01 or 0.05.
-              </help>
-            </param>
-            <param name="ProbThreshold" type="float" value="0.99" optional="true" min=".00" max="1." label="ProbThreshold" >
-              <help>
-ProbThreshold: (0.0~0.99) Probability threshold for peptide-centric targeted extraction. This probability is calculated by DIA-Umpire based on LDA analysis of true and decoy targeted identifications. (default: 0.99)
-Recommended value: 0.99 corresponds to 99% confidence in an ID. Which means FDR should be less than 1% in that case.
-              </help>
-            </param>
-          </when>
-        </conditional>
-<!--
--->
-        <conditional name="quant_settings">
-          <param name="advanced" type="select" label="Advanced Quantitation Settings" help="Usually do not need to be changed">
-            <option value="no">no</option>
-            <option value="yes">yes</option>
-          </param>
-          <when value="no"/>
-          <when value="yes">
-            <param name="FilterWeight" type="select" label="FilterWeight to remove shared peptides for protein quantitation">
-                <option value="GW" selected="true">peptide group weight</option>
-                <option value="PepW">peptide weight</option>
-            </param>
-            <param name="MinWeight" type="float" value=".9" optional="true" min="0.0" max="1.0" label="MinWeight" >
-              <help>
-Minimum weight (peptide group weight or peptide weight chosen from the previous option) threshold of peptides to be considered for protein quantitation. Higher weight (closer to 1) of a peptide for a protein is more likely to be a unique peptide for the protein. (default: 0.9)
-Recommended value: 0.9
-              </help>
-            </param>
-            <param name="TopNFrag" type="integer" value="6" optional="true" min="1" max="10" label="TopNFrag">
-              <help>
-Top N fragments in terms of fragment score (Pearson correlation fragment intensity) used for determining peptide ion intensity (default:6).
-Recommended value: 3 - 6
-              </help>
-            </param>
-            <param name="TopNPep" type="integer" value="6" optional="true" min="1" max="10" label="TopNPep">
-              <help>
-Top N peptide ions in terms of peptide ion intensity (determined by top fragments) used for determining protein intensity (default:6)
-Recommended value: 3~6
-              </help>
-            </param>
-            <param name="Freq" type="float" value=".5" optional="true" min=".1" max="1." label="Freq" >
-              <help>
-Minimum frequency of a peptide ion or fragment across all samples/replicates to
-be considered for Top N ranking. (default:0.5) Recommended value: 0.5 or more
-              </help>
-            </param>
-          </when>
-        </conditional>
-    </inputs>
-
-    <outputs>
-        <data format="txt" name="logfile" label="${tool.name} log"/>
-        <data format="dia_umpire.quant" name="dia_umpire_quant" label="${tool.name}}"/>
-        <data format="tabular" name="IDNoSummary" label="${tool.name}} IDNoSummary.xls"/>
-        <data format="tabular" name="FragSummary" label="${tool.name}} FragSummary.xls"/>
-        <data format="tabular" name="PeptideSummary" label="${tool.name}} PeptideSummary.xls"/>
-        <data format="tabular" name="ProtSummary" label="${tool.name}} ProtSummary.xls"/>
-    </outputs>
-    <tests>
-        <test>
-        </test>
-    </tests>
-    <help>
-<![CDATA[
-=============================================================
-**DIA-Umpire quantitation and targeted re-extraction module**
-=============================================================
-
-DIA_Umpire_Quant.jar provides quantitation and targeted re-extraction analysis by taking results from Step A signal extraction and Step B untargeted MS/MS database search.
-
-Manual:  http://sourceforge.net/projects/diaumpire/files/Manual/DIA_Umpire_Manual_v1.4_pre.pdf
-
-**Input** (DIA-Umpire quantitation and targeted re-extraction module)
-=====================================================================
-
-  1. Identification results: a .pep.xml result file for each .mgf file and a prot.xml for the entire dataset.
-  2. Protein sequence database in FASTA format which was used in Step B (untargeted MS/MS database search).
-  3. All files, including the binary files (.serFS) and .mgf files generated from the signal extraction module, as well as the mzXML files converted from mgf files.
-  4. Quantitation parameter file (An example "diaumpire.quant_params" can be downloaded at http://goo.gl/wThAVI)
-
-**Parameters** (for parameter file diaumpire.quant_params)
-==========================================================
-
-  **Basic parameters** that the users usually need to modify accordingly.
-
-      *TargetedExtraction*: Whether to process targeted re-extraction across samples and replicates. Set it as false if you don't want to reprocess data but wish to export quantitation report based on different fragment/peptide selection options
-
-      *Fasta*: Path to a protein sequence database in FASTA format which was used for untargeted MS/MS database search.
-
-      *Combined_Prot*: Path to the combined ProteinProphet .prot.xml file.
-
-      *DecoyPrefix*: Tag/prefix of decoy protein names that you used for protein database search. Typical values: if you are unsure what that prefix was, check protein names in the FASTA file. "rev\_" and "DECOY\_" are common choices.
-
-      *InternalLibID*: Identifier for the internal spectral library.  If you are processing the dataset for the first time, it will be used as the name for the new library, if you are reprocessing data (e.g. using different thresholds/FDR levels, etc.) first a library with that name will be looked up and used if found.  Recommended value: you can use the same name for all analysis; however it is beneficial to provide unique meaningful names, to make the library more easily reusable.
-
-      *ExternalLibSearch*: (new parameter in v1.4): Whether to process targeted extraction across samples and replicates to research unidentified peptide ions from specified external spectral library. Peptide ions in external library will be research if it satisfies the two conditions. (1) unidentified from initial database search, and (2) unidentified or identified but the probability was lower than the specified threswhold described below. (Please note that this feature is still being tested, and contact us if you have any questions)
-
-      *ExternalLibPath*: (new parameter in v1.4): File path of external spectral library file. Currently only traML and custom binary (.serFS) formats are supported, and a decoy spectrum for each forward peptide ion sequence is required in the library file. (Effective only when ExternalLibSearch is set as true)
-
-      *ExternalLibDecoyTag*: (new parameter in v1.4): Decoy tag of decoy spectra. (default: DECOY)
-
-      *ReSearchProb*: (new parameter in v1.4): Probability threshold to determine which peptide ion will be re-searched using external spectral library. (default: 0.5)
-
-
-  **Advanced parameters** that usually do **not** need to be changed
-
-    **FDR estimation parameters**:
-
-        *PeptideFDR*: Target peptide level FDR.
-        DIA-Umpire estimates peptide level FDR by target-decoy approach according to peptide ion's maximum PeptideProphet probability. (default: 0.01)
-        Recommended value: 0.01 or 0.05 are the standard thresholds used in proteomics studies, corresponding to 1% and 5% FDR.
-
-        *ProteinFDR*: Target protein level FDR.
-        DIA-Umpire fist removes protein identifications with low protein group probability (<0.5) and estimates protein level FDR of the remaining list by target- decoy approach according to the maximum peptide ion's probability. (default: 0.01)
-        Recommended value: 0.01 or 0.05.
-
-        *ProbThreshold*: (0.0~0.99) Probability threshold for peptide-centric targeted extraction. This probability is calculated by DIA-Umpire based on LDA analysis of true and decoy targeted identifications. (default: 0.99)
-        Recommended value: 0.99 corresponds to 99% confidence in an ID. Which means FDR should be less than 1% in that case.
-
-    **Quantitation parameters**
-
-        *FilterWeight*: (GW or PepW) Choice of using peptide group weight or peptide weight (computed by ProteinProphet) to remove shared peptides for protein quantitation. (default: GW)
-        MinWeight: (0.0~0.99) Minimum weight (peptide group weight or peptide weight chosen from the previous option) threshold of peptides to be considered for protein quantitation. Higher weight (closer to 1) of a peptide for a protein is more likely to be a unique peptide for the protein. (default: 0.9)
-        Recommended value: 0.9
-
-        *TopNFrag*: Top N fragments in terms of fragment score (Pearson correlation x fragment intensity) used for determining peptide ion intensity (default:6).
-        Recommended value: 3~6
-
-        *TopNPep*: Top N peptide ions in terms of peptide ion intensity (determined by top
-        fragments) used for determining protein intensity (default:6)
-        Recommended value: 3~6
-
-        *Freq*: Minimum frequency of a peptide ion or fragment across all samples/replicates to
-        be considered for Top N ranking. (default:0.5) Recommended value: 0.5 or more
-
-**Output** (DIA-Umpire quantitation and targeted re-extraction module):
-=======================================================================
-
-  Binary files which include identification and quantitation information, and possibly the internal spectral library.
-
-  Three summary tables for protein, peptide ion, and fragment level reports (<filename> denotes the name of the raw file in which a peptide was identified)
-
-     1. Columns printed in protein summary table (ProtSummary.xls)
-
-        1. Protein Key: Protein accession number
-        2. <filename>_Prob: Protein identification probability
-        3. <filename>_Peptides: Number of identified peptide ions assigned to a protein
-        4. <filename>_PSMs: Number of identified pseudo MS/MS spectra assigned to a protein
-        5. <filename>_MS1_iBAQ: Protein abundance estimated by MS1 peptide intensities (See manuscript for details) (iBAQ: sum of all identified peptide intensities divided by the number of theoretical tryptic peptides)
-        6. <filename>_TopNpep/TopNfra, Freq>freq: Protein abundance estimated by top scored peptide ions and fragments (See manuscript for details).
-
-     2. Columns printed in peptide ion summary table (PeptideSummary.xls)
-
-        1. Peptide Key: Peptide ion identifier
-        2. Sequence: Peptide sequence
-        3. ModSeq: Peptide sequence with modification information
-        4. Proteins: Parent proteins
-        5. mz: Precursor m/z of peptide ion
-        6. Charge: Charge state of peptide ion
-        7. MaxProb: Maximum identification probability of peptide ion across the whole data- set from untargeted MS/MS database search
-        8. <filename>_Spec_Centric_Prob: Identification probability of a peptide ion from untargeted MS/MS database search
-        9. <filename>_Pep_Centric_Prob: Identification probability of a peptide ion from targeted re-extraction matching
-        10. <filename>_PSMs: The number of identified pseudo MS/MS spectra assigned to a peptide ion
-        11. <filename>_RT: Retention time of a peptide ion
-        12. <filename>_MS1: Peptide abundance estimated by MS1 precursor intensity 2.13. <filename>_TopNfra: Peptide abundance estimated by top N fragment ions
-
-     3. Columns printed in fragment summary table (FragSummary.xls)
-
-        1. Fragment Key: Fragment ion identifier
-        2. Protein: Parent protein accession number
-        3. Peptide: Parent peptide ion identifier
-        4. Fragment: Fragment ion type
-        5. FragMz: m/z of fragment ion
-        6. <filename>_RT: Retention time of parent peptide ion 
-        7. <filename>_Spec_Centric_Prob: Identification probability of peptide ion from untargeted MS/MS database search
-        8. <filename>_Pep_Centric_Prob: Identification probability of peptide ion from targeted re-extraction matching
-        9. <filename>_Intensity: fragment intensity
-        10. <filename>_Corr: Elution profile Pearson correlation between fragment ion and precursor peptide ion
-        11. <filename>_PPM: Mass error of an observed fragment m/z to the theoretical one
-
-]]>
-    </help>
-    <expand macro="citations" />
-</tool>
diff -r 6caa9011f245 -r e8822850243a dia_umpire_se.xml
--- a/dia_umpire_se.xml	Mon Mar 04 11:49:18 2019 -0500
+++ b/dia_umpire_se.xml	Mon Mar 04 11:49:42 2019 -0500
@@ -7,27 +7,16 @@
     <expand macro="stdio" />
     <command>
 <![CDATA[
+#set $output_dir = 'gx_path'
 #import re
-## want to save all outputs in a directory output.extra_files_path to be used by dia_umpire_quant
-## Is file naming going to be a problem? May need to have a name param
-#if $se_extraction_data:
-#set se_params = $se_ser
-#set $ser_dir = $se_ser.extra_files_path
-mkdir $ser_dir
-&& ln -s '$ser_dir' '$output_dir'
-&& cat $se_config > $se_ser 
-#else:
-#set se_params = $params
 mkdir '$output_dir'
 && cat $se_config > $se_params 
-#end if
-##
 && echo " " >> $se_params 
 && echo "Thread = \$GALAXY_SLOTS" >> $se_params
 #if $input_prefix and len($input_prefix.strip()) > 0:
 #set $input_path = str($output_dir) + '/' + $input_prefix.__str__ + '_rep' + str($i + 1) + '.mzXML' 
 #else:
-#set $input_path = str($output_dir) + '/' + $re.sub('\.[mM]\w+$','',$re.sub('[^-a-zA-Z0-9_.]','_',$input.name)) + '.mzXML'
+#set $input_path = str($output_dir) + '/' + $re.sub('\.[mM]\w+$','',$re.sub('[^-a-zA-Z0-9_.]','_',$input.element_identifier)) + '.mzXML'
 #end if
 && ln -s '${input}' '$input_path'
 &&  dia_umpire_se '$input_path' '$se_params'
@@ -201,8 +190,6 @@
         <param name="input_prefix" type="text" value="" optional="true" label="File name prefix" help="Names inputs: prefix_rep#.mzXML Leave blank to use History names of input">
           <validator type="regex" message="">[a-zA-Z][a-zA-Z0-9_-]*</validator>
         </param>
-        <param name="output_dir" type="hidden" value="gx_path"/>
-
         <conditional name="instrument">
           <param name="model" type="select" label="instrument used" help="Sets default parameters">
             <option value="Thermo_Orbitrap">Thermo Orbitrap</option>
@@ -210,7 +197,6 @@
             <option value="other">other</option>
           </param>
           <when value="Thermo_Orbitrap">
-       
             <param name="SE_MS1PPM" type="float" value="5" min="1" max="20" optional="true" label="Maximum mass error for two MS1 peaks">
                 <help>
 SE.MS1PPM: (Unit: ppm) Maximum mass error for two MS1 peaks in consecutive spectra to be considered signal of the same ion. Used in MS1 signal detection and precursor alignment between samples/runs.
@@ -224,7 +210,6 @@
                 </help>
             </param>
             <expand macro="common_se_params" />
-
           </when>
           <when value="AB_SCIEX_Triple_TOF_5600">
             <param name="SE_MS1PPM" type="float" value="30" min="1" max="50" optional="true" label="Maximum mass error for two MS1 peaks">
@@ -287,7 +272,6 @@
 RTOverlap: Retention time overlap. (Default: 0.3)
               </help>
             </param>
-
             <param name="DeltaApex" type="float" value=".6" min="0" optional="true" label="DeltaApex" >
               <help>
 DeltaApex: (Unit: minute) Maximum retention time difference of LC profile apexes between precursor and fragment (the lower, the more stringent). (Default: 0.6)
@@ -313,7 +297,6 @@
           </param>
           <when value="no"/>
           <when value="yes">
-
             <param name="SE_MinMSIntensity" type="float" value="" optional="true" label="MinMSIntensity" >
               <help>
 SE.MinMSIntensity: Minimum signal intensity for a peak in an MS1 spectrum to be considered as a valid signal. Any MS1 peak having intensity lower than this threshold will be ignored. It is the main parameter controlling how many peaks and isotopic envelopes will be detected.
@@ -378,7 +361,6 @@
 
             <param name="SE_MinRTRange" type="float" value="" optional="true" label="MinRTRange" >
               <help>
-
               </help>
             </param>
             <param name="SE_MaxNoPeakCluster" type="integer" value="" optional="true" label="MaxNoPeakCluster" >
@@ -394,7 +376,6 @@
             <param name="SE_MinMS2NoPeakCluster" type="integer" value="" optional="true" label="MinMS2NoPeakCluster" >
               <help>
 SE.MinMS2NoPeakCluster (new parameter in v1.4): Minimum number of isotope peaks for a MS2 feature. When it is set as 1, the algorithm will group fragments even for peaks without any isotope signal being found. For these cases, the assumed charged states will be from the parameter SE.StartCharge to SE.EndCharge.
-
               </help>
             </param>
             <param name="SE_RTtol" type="float" value="" optional="true" label="RTtol" >
@@ -437,8 +418,6 @@
         <param name="ExportFragmentPeak" type="boolean" truevalue="true" falsevalue="false" checked="false" 
                label="ExportFragmentPeak"
                help="Output detailed information about detected MS2 signals"/>
-        <param name="se_extraction_data" type="boolean" truevalue="Signal Extraction data" falsevalue="diaumpire_se.params" checked="false" 
-               label="Output Signal Extraction data for DIA_Umpire_Quant" />
         <param name="mgfs_as_collection" type="boolean" truevalue="true" falsevalue="false" checked="false" 
                label="Output MGFs as a collection" />
 
@@ -446,12 +425,7 @@
 
     <outputs>
         <data format="txt" name="logfile" label="${tool.name} ${on_string} log"/>
-        <data format="dia_umpire.ser" name="se_ser" label="${tool.name} ${input.name} ${se_extraction_data}">
-            <filter>se_extraction_data</filter>
-        </data>
-        <data format="txt" name="params" label="${tool.name} ${input.name} ${se_extraction_data}">
-            <filter>not se_extraction_data</filter>
-        </data>
+        <data format="txt" name="se_params" label="${tool.name} ${input.name} diaumpire_se.params"/>
         <data format="csv" name="PrecursorPeak" label="${tool.name} ${input.name} PeakCluster.csv" from_work_dir="gx_path/swath_PeakCurve.csv">
             <filter>ExportPrecursorPeak</filter>
         </data>
@@ -489,7 +463,7 @@
             <output name="q2_mgf">
                 <assert_contents>
                     <has_text text="BEGIN IONS" />
-                    <has_text_matching expression="^PEPMASS=740.\d+$" />
+                    <has_text text="PEPMASS=740" />
                 </assert_contents>
             </output>
         </test>
@@ -561,9 +535,7 @@
 
     Note: Each file corresponds to a different "quality level" of precursor ions (Q1= More than two isotopic peaks detected in MS1, Q2 = only two isotopic peak detected, Q3 = detected unfragmented precursor in MS2). These spectra are written to separate files, because they must be searched separately against a protein database as a consequence of differences in FDR estimates for these varying quality data.
 
-  2. *DIA_Umpire_SE Signal Extraction data* - includes the binary files (.ser) containing contain all necessary information for quantitation procedures (parameter settings, all detected precursor and fragment peaks, precursor-fragment grouping information).  
-
-  3. If ExportPrecursorPeak and/or ExportFragmentPeak options were set to true, text files with detailed information about detected MS1 and/or MS2 features will be generated.
+  2. If ExportPrecursorPeak and/or ExportFragmentPeak options were set to true, text files with detailed information about detected MS1 and/or MS2 features will be generated.
 
 
 ]]>
diff -r 6caa9011f245 -r e8822850243a test-data/LongSwath_UPS1_1ug_rep1_xs_Q2.mgf
--- a/test-data/LongSwath_UPS1_1ug_rep1_xs_Q2.mgf	Mon Mar 04 11:49:18 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-BEGIN IONS
-PEPMASS=740.93756
-CHARGE=4+
-RTINSECONDS=23.515736
-TITLE=LongSwath_UPS1_1ug_rep1_xs_Q2.1.1.4
-289.0418 0.13421604
-462.80182 0.34596336
-476.83914 0.076175064
-495.8407 0.28123242
-505.83884 0.40484485
-510.82834 0.26279047
-512.8057 0.08942752
-516.8521 0.09888018
-528.8025 0.17339894
-539.8589 0.034855265
-548.77325 0.2268137
-561.8681 0.36307892
-563.7804 0.02051069
-566.7381 0.3546458
-581.84204 0.34910008
-588.8908 0.33360612
-600.7914 0.04130452
-647.8723 0.42873022
-END IONS
-