preparing post matching release

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2259 e4b6dbb4-9209-464b-83f7-6257456c460c

masschroq/CMakeLists.txt

@@ -24,7 +24,7 @@ SET (MASSCHROQ_LIB_NAME "masschroq")
 SET (MASSCHROQ_LIB_VERSION "1.0.0")
 SET (MASSCHROQ_LIB_SOVERSION "1")
 
-SET (MASSCHROQ_SCHEMA_VERSION "1.1")
+SET (MASSCHROQ_SCHEMA_VERSION "${MASSCHROQ_MAJOR_VERSION}.${MASSCHROQ_MINOR_VERSION}")
 SET (MASSCHROQ_SCHEMA_FILE "masschroq-${MASSCHROQ_SCHEMA_VERSION}.xsd")
 SET (MASSCHROQ_XSD_LOCATION_DIR "${masschroq_SOURCE_DIR}/doc/schema") 
 SET (masschroq_BINARY_DIR "bin") 

masschroq/doc/manual/masschroq_complete_input_example.xml

@@ -62,7 +62,7 @@
 <quantification_methods>
 <quantification_method id="my_qzivy">
 	<xic_extraction xic_type="sum">
-	<mz_range max="1.5" min="0.5"/>
+	<mz_range max="0.3" min="0.3"/>
 	</xic_extraction>
  	<xic_filters>
 	<anti_spike half="5"/>
@@ -81,7 +81,7 @@
 </quantification_method>
 <quantification_method id="my_qmoulon">
 	<xic_extraction xic_type="max">	
-	<ppm_range max="1.5" min="0.5"/>
+	<ppm_range max="10" min="10"/>
 	</xic_extraction>
  	<xic_filters>
 	<background half_mediane="5" half_min_max="15"/>
@@ -100,7 +100,7 @@
 <quantification_result output_file="result1" format ="tsv"/>
 <quantification_result output_file="result2" format="gnumeric"/>
 <quantification_result output_file="result3" format ="xhtmltable"/>
-<quantification_result output_file="result4" format ="xml" xic_traces="true"/>
+<quantification_result output_file="result4" format ="masschroqml" xic_traces="true"/>
 </quantification_results>
 <quantification_traces>
 <peptide_traces peptide_ids="pep0 pep1" output_dir="pep_traces" format="tsv"/>
@@ -117,7 +117,7 @@
 <peptides_in_peptide_list mode="real_or_mean"/>
 </quantify>
 <quantify id="q2" withingroup="G2" quantification_method_id="my_moulon">
-<peptides_in_peptide_list mode="real_or_mean" isotope_label_refs="iso1 iso2"/>
+<peptides_in_peptide_list mode="post_matching" isotope_label_refs="iso1 iso2"/>
 <mz_list>732.317 449.754 552.234 464.251 381.577 569.771 575.256</mz_list>
 <mzrt_list>
 <mzrt mz="732.317" rt="230.712"/>

masschroq/win32/masschroq_readme.tex

@@ -16,21 +16,21 @@
   urlcolor=blue
 }
 \newcommand{\M}{MassChroQ}
-\newcommand{\Mv}{MassChroQ v.1.1}
+\newcommand{\Mv}{MassChroQ v.1.2}
 \newcommand{\mexe}{\texttt{masschroq.exe}}
 \newcommand{\sitemasschroq}{http://pappso.inra.fr/bioinfo/masschroq/}
 \newcommand{\sitepappso}{http://pappso.inra.fr/}
 
 \begin{document}
 \title{\color{blue}\parbox[t]{\textwidth}{\centering MassChroQ
-version 1.1 Readme file}}
+version 1.2 Readme file}}
 \date{}
 \maketitle
 
-Congratulations! MassChroQ version 1.1 is now installed on your Windows 
+Congratulations! MassChroQ version 1.2 is now installed on your Windows 
 system. 
 
-Your MassChroQ's installation directory contains:
+Your MassChroQ installation directory contains:
 
 \begin{itemize}
 \item the \emph{manual}, explaining MassChroQ features and use.
@@ -102,8 +102,4 @@ subversion repository from \url{https://subversion.cru.fr/masschroq/}.
 Feel free and very welcomed to contribute to the {\M} project by
 directly contacting one of its authors.
 
-\end{document} 	 
-   
- 
-
-
+\end{document}
\ No newline at end of file