refs#16

In PARTONSrelease (trunk) : - Corrected kinematics for observable. - Updated demo scenario. - Added plot files for observable.

refs#16
In PARTONSrelease (trunk) : - Corrected kinematics for observable. - Updated demo scenario. - Added plot files for observable.
e2ad9fd5 · Bryan Berthou · bcda19eb · e2ad9fd5 · e2ad9fd5 · e2ad9fd5
Commit e2ad9fd5 authored Oct 18, 2016 by Bryan Berthou
--- a/bin/scenarios/demo/computeManyKinematicOneDVCSObservable.xml
+++ b/bin/scenarios/demo/computeManyKinematicOneDVCSObservable.xml
@@ -2,86 +2,86 @@

 <scenario date="2016-10-18" description="...">

-<!-- Compute things with GK11 -->
-    <task service="ObservableService" method="computeObservable">
-        <kinematics type="ObservableKinematic">
-            <param name="file"
-                value="/home/debian/workspace/PARTONS_release/bin/scenarios/demo/observable_kinematics.dat" />
-        </kinematics>
-
-        <computation_configuration>
-            <module type="Observable">
-                <param name="className" value="Alu" />
-            </module>
-
-            <module type="DVCSModule">
-                <param name="className" value="BMJ2012Model" />
-                <param name="beam_energy" value="5.77" />
-            </module>
-
-            <module type="DVCSConvolCoeffFunctionModule">
-                <param name="className" value="DVCSCFFModel" />
-                <param name="qcd_order_type" value="LO" />
-            </module>
-
-            <module type="GPDModule">
-                <param name="className" value="GK11Model" />
-            </module>
-
-            <module type="ScaleModule">
-                <param name="className" value="Q2Multiplier" />
-                <param name="lambda" value="1" />
-            </module>
-
-            <module type="XiConverterModule">
-                <param name="className" value="XBToXi" />
-            </module>
-        </computation_configuration>
-    </task>
-
-<!-- Show results on screen -->
-    <task service="ObservableService" method="printResults">
-    </task>
-
-<!-- Compute things with VGG -->
-    <task service="ObservableService" method="computeObservable">
-        <kinematics type="ObservableKinematic">
-            <param name="file"
-                value="/home/debian/workspace/PARTONS_release/bin/scenarios/demo/observable_kinematics.dat" />
-        </kinematics>
-
-        <computation_configuration>
-            <module type="Observable">
-                <param name="className" value="Alu" />
-            </module>
-
-            <module type="DVCSModule">
-                <param name="className" value="BMJ2012Model" />
-                <param name="beam_energy" value="5.77" />
-            </module>
-
-            <module type="DVCSConvolCoeffFunctionModule">
-                <param name="className" value="DVCSCFFModel" />
-                <param name="qcd_order_type" value="LO" />
-            </module>
-
-            <module type="GPDModule">
-                <param name="className" value="VGGModel" />
-            </module>
-
-            <module type="ScaleModule">
-                <param name="className" value="Q2Multiplier" />
-                <param name="lambda" value="1" />
-            </module>
-
-            <module type="XiConverterModule">
-                <param name="className" value="XBToXi" />
-            </module>
-        </computation_configuration>
-    </task>
-
-<!-- Show results on screen -->
-    <task service="ObservableService" method="printResults">
-    </task>
-    
+	<!-- Compute things with GK11 -->
+	<task service="ObservableService" method="computeManyKinematicOneModel" storeInDB="0">
+		<kinematics type="ObservableKinematic">
+			<param name="file"
+				value="/home/debian/workspace/PARTONS_release/bin/scenarios/demo/observable_kinematics.dat" />
+		</kinematics>
+
+		<computation_configuration>
+			<module type="Observable">
+				<param name="className" value="Alu" />
+			</module>
+
+			<module type="DVCSModule">
+				<param name="className" value="BMJ2012Model" />
+				<param name="beam_energy" value="1066" />
+			</module>
+
+			<module type="DVCSConvolCoeffFunctionModule">
+				<param name="className" value="DVCSCFFModel" />
+				<param name="qcd_order_type" value="LO" />
+			</module>
+
+			<module type="GPDModule">
+				<param name="className" value="GK11Model" />
+			</module>
+
+			<module type="ScaleModule">
+				<param name="className" value="Q2Multiplier" />
+				<param name="lambda" value="1" />
+			</module>
+
+			<module type="XiConverterModule">
+				<param name="className" value="XBToXi" />
+			</module>
+		</computation_configuration>
+	</task>
+
+	<!-- Show results on screen -->
+	<task service="ObservableService" method="printResults">
+	</task>
+
+	<!-- Compute things with VGG -->
+	<task service="ObservableService" method="computeManyKinematicOneModel" storeInDB="0">
+		<kinematics type="ObservableKinematic">
+			<param name="file"
+				value="/home/debian/workspace/PARTONS_release/bin/scenarios/demo/observable_kinematics.dat" />
+		</kinematics>
+
+		<computation_configuration>
+			<module type="Observable">
+				<param name="className" value="Alu" />
+			</module>
+
+			<module type="DVCSModule">
+				<param name="className" value="BMJ2012Model" />
+				<param name="beam_energy" value="1066" />
+			</module>
+
+			<module type="DVCSConvolCoeffFunctionModule">
+				<param name="className" value="DVCSCFFModel" />
+				<param name="qcd_order_type" value="LO" />
+			</module>
+
+			<module type="GPDModule">
+				<param name="className" value="VGGModel" />
+			</module>
+
+			<module type="ScaleModule">
+				<param name="className" value="Q2Multiplier" />
+				<param name="lambda" value="1" />
+			</module>
+
+			<module type="XiConverterModule">
+				<param name="className" value="XBToXi" />
+			</module>
+		</computation_configuration>
+	</task>
+
+	<!-- Show results on screen -->
+	<task service="ObservableService" method="printResults">
+	</task>
+
 </scenario>
\ No newline at end of file
--- a/bin/scenarios/demo/observable_GK11_file_plot.csv
+++ b/bin/scenarios/demo/observable_GK11_file_plot.csv
+0 0
+10 -0.024736075012605108
+20 -0.048810639423911277
+30 -0.071572336121144678
+40 -0.092390778006510757
+50 -0.11066860645769878
+60 -0.12585520169224415
+70 -0.13746220202871029
+80 -0.14508065788236532
+90 -0.14839925286379493
+100 -0.14722259921891667
+110 -0.14148820653068681
+120 -0.13128039656161541
+130 -0.11683926917839976
+140 -0.09856288731210848
+150 -0.077001193872405033
+160 -0.052840809202095294
+170 -0.026880735040467164
+180 -5.7762479011841989e-17
+190 0.026880735040467108
+200 0.052840809202095239
+210 0.077001193872405088
+220 0.098562887312108424
+230 0.11683926917839972
+240 0.13128039656161544
+250 0.14148820653068689
+260 0.14722259921891664
+270 0.14839925286379477
+280 0.14508065788236532
+290 0.13746220202871029
+300 0.12585520169224415
+310 0.11066860645769871
+320 0.09239077800651066
+330 0.071572336121144678
+340 0.048810639423911277
+350 0.024736075012605111
+360 9.0547874403168658e-17
--- a/bin/scenarios/demo/observable_VGG_file_plot.csv
+++ b/bin/scenarios/demo/observable_VGG_file_plot.csv
+0 0
+10 -0.023709356459071317
+20 -0.046723344692576378
+30 -0.068364701807437325
+40 -0.087992190621484181
+50 -0.10501811184079619
+60 -0.11892511450261725
+70 -0.12928192075748196
+80 -0.13575748664806325
+90 -0.13813304040376051
+100 -0.13631139203037018
+110 -0.13032290803141755
+120 -0.12032760328984851
+130 -0.10661292199303778
+140 -0.089586956874842583
+150 -0.069767079438794288
+160 -0.047764205564715709
+170 -0.024263179338465335
+180 -5.5755950520540242e-17
+190 0.024263179338465335
+200 0.047764205564715542
+210 0.069767079438794288
+220 0.089586956874842485
+230 0.10661292199303776
+240 0.12032760328984841
+250 0.13032290803141755
+260 0.13631139203037021
+270 0.13813304040376045
+280 0.13575748664806325
+290 0.12928192075748199
+300 0.11892511450261717
+310 0.10501811184079611
+320 0.08799219062148414
+330 0.068364701807437422
+340 0.046723344692576378
+350 0.023709356459071414
+360 0
--- a/bin/scenarios/demo/observable_kinematics.dat
+++ b/bin/scenarios/demo/observable_kinematics.dat
-0.01|-0.1|16 0|0
-0.01|-0.1|16 0|10
-0.01|-0.1|16 0|20
-0.01|-0.1|16 0|30
-0.01|-0.1|16 0|40
-0.01|-0.1|16 0|50
-0.01|-0.1|16 0|60
-0.01|-0.1|16 0|70
-0.01|-0.1|16 0|80
-0.01|-0.1|16 0|90
-0.01|-0.1|16 0|100
-0.01|-0.1|16 0|110
-0.01|-0.1|16 0|120
-0.01|-0.1|16 0|130
-0.01|-0.1|16 0|140
-0.01|-0.1|16 0|150
-0.01|-0.1|16 0|160
-0.01|-0.1|16 0|170
-0.01|-0.1|16 0|180
-0.01|-0.1|16 0|190
-0.01|-0.1|16 0|200
-0.01|-0.1|16 0|210
-0.01|-0.1|16 0|220
-0.01|-0.1|16 0|230
-0.01|-0.1|16 0|240
-0.01|-0.1|16 0|250
-0.01|-0.1|16 0|260
-0.01|-0.1|16 0|270
-0.01|-0.1|16 0|280
-0.01|-0.1|16 0|290
-0.01|-0.1|16 0|300
-0.01|-0.1|16 0|310
-0.01|-0.1|16 0|320
-0.01|-0.1|16 0|330
-0.01|-0.1|16 0|340
-0.01|-0.1|16 0|350
-0.01|-0.1|16 0|360
\ No newline at end of file
+0.01|-0.1|16|0
+0.01|-0.1|16|10
+0.01|-0.1|16|20
+0.01|-0.1|16|30
+0.01|-0.1|16|40
+0.01|-0.1|16|50
+0.01|-0.1|16|60
+0.01|-0.1|16|70
+0.01|-0.1|16|80
+0.01|-0.1|16|90
+0.01|-0.1|16|100
+0.01|-0.1|16|110
+0.01|-0.1|16|120
+0.01|-0.1|16|130
+0.01|-0.1|16|140
+0.01|-0.1|16|150
+0.01|-0.1|16|160
+0.01|-0.1|16|170
+0.01|-0.1|16|180
+0.01|-0.1|16|190
+0.01|-0.1|16|200
+0.01|-0.1|16|210
+0.01|-0.1|16|220
+0.01|-0.1|16|230
+0.01|-0.1|16|240
+0.01|-0.1|16|250
+0.01|-0.1|16|260
+0.01|-0.1|16|270
+0.01|-0.1|16|280
+0.01|-0.1|16|290
+0.01|-0.1|16|300
+0.01|-0.1|16|310
+0.01|-0.1|16|320
+0.01|-0.1|16|330
+0.01|-0.1|16|340
+0.01|-0.1|16|350
+0.01|-0.1|16|360
\ No newline at end of file