-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Get Data: mz low/high cutoffs to Double. Add List mz low/high cutoffs
For the existing mz low/high cutoffs, change from Float to Double. Add List of mz low/high cutoffs to Get_ScanDataFromScanNumbers_Request
- Loading branch information
Showing
6 changed files
with
218 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...ice_request_response/sub_parts/Get_ScanDataFromScanNumbers_M_Over_Z_Range_SubRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package org.yeastrc.spectral_storage.get_data_webapp.shared_server_client.webservice_request_response.sub_parts; | ||
|
|
||
| import javax.xml.bind.annotation.XmlAccessType; | ||
| import javax.xml.bind.annotation.XmlAccessorType; | ||
| import javax.xml.bind.annotation.XmlAttribute; | ||
|
|
||
| /** | ||
| * Sub Part for class Get_ScanDataFromScanNumbers_Request | ||
| * | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other | ||
| * | ||
| */ | ||
| @XmlAccessorType(XmlAccessType.FIELD) | ||
| public class Get_ScanDataFromScanNumbers_M_Over_Z_Range_SubRequest { | ||
|
|
||
|
|
||
| /** | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other | ||
| */ | ||
| @XmlAttribute // attribute name is property name | ||
| private Double mzLowCutoff; | ||
|
|
||
| /** | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other | ||
| */ | ||
| @XmlAttribute // attribute name is property name | ||
| private Double mzHighCutoff; | ||
|
|
||
|
|
||
|
|
||
| public Double getMzLowCutoff() { | ||
| return mzLowCutoff; | ||
| } | ||
|
|
||
| public void setMzLowCutoff(Double mzLowCutoff) { | ||
| this.mzLowCutoff = mzLowCutoff; | ||
| } | ||
|
|
||
| public Double getMzHighCutoff() { | ||
| return mzHighCutoff; | ||
| } | ||
|
|
||
| public void setMzHighCutoff(Double mzHighCutoff) { | ||
| this.mzHighCutoff = mzHighCutoff; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 75 additions & 7 deletions
82
...get_data_webapp/servlet_response_factories/SingleScan_SubResponse_Factory_Parameters.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,102 @@ | ||
| package org.yeastrc.spectral_storage.get_data_webapp.servlet_response_factories; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Parameters to SingleScan_SubResponse_Factory | ||
| * | ||
| */ | ||
| public class SingleScan_SubResponse_Factory_Parameters { | ||
|
|
||
| /** | ||
| * If populated, do not return any peaks with mz below this cutoff. | ||
| * If populated, do not return any peaks with mz below this cutoff. | ||
| * | ||
| * This cutoff is applied in Addition To the filters in property 'm_Over_Z_Range_Filters' | ||
| */ | ||
| private Float mzLowCutoff; | ||
| private Double mzLowCutoff; | ||
|
|
||
| /** | ||
| * If populated, do not return any peaks with mz above this cutoff. | ||
| * | ||
| * This cutoff is applied in Addition To the filters in property 'm_Over_Z_Range_Filters' | ||
| */ | ||
| private Double mzHighCutoff; | ||
|
|
||
| /** | ||
| * Each m/z range is OR with each other | ||
| */ | ||
| private Float mzHighCutoff; | ||
| private List<SingleScan_SubResponse_Factory_Parameters__M_Over_Z_Range> m_Over_Z_Range_Filters; | ||
|
|
||
|
|
||
| /// | ||
|
|
||
|
|
||
| /** | ||
| * Sub Part for class SingleScan_SubResponse_Factory_Parameters | ||
| * | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other and with the m/z range in the main request | ||
| * | ||
| */ | ||
| public static class SingleScan_SubResponse_Factory_Parameters__M_Over_Z_Range { | ||
|
|
||
| /** | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other and with the m/z range in the main request | ||
| */ | ||
| private Double mzLowCutoff; | ||
|
|
||
| /** | ||
| * A Single m/z range to filter the returned scan peaks | ||
| * | ||
| * Each m/z range is OR with each other and with the m/z range in the main request | ||
| */ | ||
| private Double mzHighCutoff; | ||
|
|
||
|
|
||
|
|
||
| public Double getMzLowCutoff() { | ||
| return mzLowCutoff; | ||
| } | ||
|
|
||
| public Float getMzLowCutoff() { | ||
| public void setMzLowCutoff(Double mzLowCutoff) { | ||
| this.mzLowCutoff = mzLowCutoff; | ||
| } | ||
|
|
||
| public Double getMzHighCutoff() { | ||
| return mzHighCutoff; | ||
| } | ||
|
|
||
| public void setMzHighCutoff(Double mzHighCutoff) { | ||
| this.mzHighCutoff = mzHighCutoff; | ||
| } | ||
| } | ||
|
|
||
| public Double getMzLowCutoff() { | ||
| return mzLowCutoff; | ||
| } | ||
|
|
||
| public void setMzLowCutoff(Float mzLowCutoff) { | ||
| public void setMzLowCutoff(Double mzLowCutoff) { | ||
| this.mzLowCutoff = mzLowCutoff; | ||
| } | ||
|
|
||
| public Float getMzHighCutoff() { | ||
| public Double getMzHighCutoff() { | ||
| return mzHighCutoff; | ||
| } | ||
|
|
||
| public void setMzHighCutoff(Float mzHighCutoff) { | ||
| public void setMzHighCutoff(Double mzHighCutoff) { | ||
| this.mzHighCutoff = mzHighCutoff; | ||
| } | ||
|
|
||
|
|
||
| public List<SingleScan_SubResponse_Factory_Parameters__M_Over_Z_Range> getM_Over_Z_Range_Filters() { | ||
| return m_Over_Z_Range_Filters; | ||
| } | ||
|
|
||
| public void setM_Over_Z_Range_Filters( | ||
| List<SingleScan_SubResponse_Factory_Parameters__M_Over_Z_Range> m_Over_Z_Range_Filters) { | ||
| this.m_Over_Z_Range_Filters = m_Over_Z_Range_Filters; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters