Commit c68b976f authored by Bryan Berthou's avatar Bryan Berthou
Browse files

refs#16

In PARTONS_release (trunk) :
- Update partons.properties and logger.cfg files
- Update few scenarios to test CrossConfiguration feature.
- Care !!! Other scenarios cannot be run.
parent a00f383f
......@@ -7,6 +7,10 @@ default.level = INFO
# Print mode values are COUT, FILE or BOTH
print.mode = BOTH
log.file.path = bin/partons.log
log.file.path = /home/debian/workspace/PARTONS_release/bin/partons.log
logger.DExpIntegrator1D = ERROR
\ No newline at end of file
logger.DExpIntegrator1D = ERROR
logger.Database = DEBUG
#logger.AcCos2phi = DEBUG
#logger.XMLParser = DEBUG
#logger.DefaultXMLParser = DEBUG
\ No newline at end of file
......@@ -25,4 +25,8 @@ computation.nb.processor = 1
xml.schema.file.path = /home/debian/workspace/PARTONS/data/automation/xmlSchema.xsd
# Temporary working directory
temporary.working.directory.path = /home/debian/temp
\ No newline at end of file
temporary.working.directory.path = /home/debian/temp
gpd.service.batch.size = 10000
ccf.service.batch.size = 1000
observable.service.batch.size = 1000
\ No newline at end of file
......@@ -2,44 +2,37 @@
<scenario date="2016-04-14" description="How to compute an observable">
<task service="ObservableService" method="computeDVCSObservable">
<kinematics type="ObservableKinematic">
<param name="xB" value="0.1763" />
<param name="t" value="-0.1346" />
<param name="Q2" value="1.3651" />
</kinematics>
<computation_configuration>
<module type="Observable">
<param name="className" value="AcCos2phi" />
</module>
<module type="DVCSModule">
<param name="className" value="GV2008Model" />
<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>
<task service="ObservableService" method="printResults">
</task>
<task service="ObservableService" method="computeObservable">
<kinematics type="ObservableKinematic">
<param name="xB" value="0.1763" />
<param name="t" value="-0.1346" />
<param name="Q2" value="1.3651" />
</kinematics>
<computation_configuration>
<module type="Observable" name="AcCos2phi">
<module type="ProcessModule" name="GV2008Model">
<param name="beam_energy" value="5.77" />
<module type="ScaleModule" name="Q2Multiplier">
<param name="lambda" value="1" />
</module>
<module type="XiConverterModule" name="XBToXi">
</module>
<module type="ConvolCoeffFunctionModule" name="DVCSCFFModel">
<param name="qcd_order_type" value="LO" />
<module type="GPDModule" name="GK11Model">
</module>
</module>
</module>
</module>
</computation_configuration>
</task>
<task service="ObservableService" method="printResults">
</task>
</scenario>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<scenario date="2016-10-18" description="...">
<!-- 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" name="Alu">
<module type="DVCSModule" name="BMJ2012Model">
<param name="beam_energy" value="1066" />
<module type="ScaleModule" name="Q2Multiplier">
<param name="lambda" value="1" />
</module>
<module type="XiConverterModule" name="XBToXi">
</module>
<module type="DVCSConvolCoeffFunctionModule" name="DVCSCFFModel">
<param name="qcd_order_type" value="LO" />
<module type="GPDModule" name="GK11Model">
</module>
</module>
</module>
</module>
</computation_configuration>
</task>
</scenario>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<scenario date="2016-04-14"
description="Example : computation of one convol coeff function model (DVCSCFF) with GPD model (GK11)">
<task service="ConvolCoeffFunctionService" method="computeWithGPDModel"
storeInDB="0">
<kinematics type="DVCSConvolCoeffFunctionKinematic">
<param name="xi" value="0.0088933952793878" />
<param name="t" value="-0.1346" />
<param name="Q2" value="1.5557" />
<param name="MuF2" value="4" />
<param name="MuR2" value="4" />
</kinematics>
<computation_configuration>
<module type="DVCSConvolCoeffFunctionModule" name="DVCSCFFModel">
<param name="qcd_order_type" value="LO" />
<module type="GPDModule" name="GK11Model">
</module>
</module>
</computation_configuration>
</task>
<task service="ConvolCoeffFunctionService" method="printResults">
</task>
</scenario>
......@@ -9,7 +9,7 @@
std::vector<std::string> parseArguments(int argc, char** argv) {
if (argc <= 1) {
throw std::runtime_error(
throw ElemUtils::CustomException("main", __func__,
"Missing argument, please provide one or more than one XML scenario file.");
}
......@@ -55,8 +55,6 @@ int main(int argc, char** argv) {
// Close PARTONS application propertly
if (pPartons) {
pPartons->close();
delete pPartons;
pPartons = 0;
}
return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment