fixes for latest version

Former-commit-id: 2e73ad9

Author: WolfgangWaltenberger

cpp/SModelS.cc

@@ -19,6 +19,8 @@ SModelS::SModelS( const std::string & parameterfile )
   PyRun_SimpleString("import time");
   PyRun_SimpleString("t0=time.time()");
   PyRun_SimpleString("import modelTester");
+  PyRun_SimpleString("import smodelsLogging");
+  // PyRun_SimpleString("smodelsLogging.setLogLevel ( \"debug\" ) ");
 	// PyObject* myModuleString = PyString_FromString((char*)"modelTester");
 	// PyObject* myModule = PyImport_Import( myModuleString );
   loadDatabase ( parameterfile );
@@ -36,7 +38,7 @@ void SModelS::loadDatabase ( const string & parameterfile )
 	buffer << "parameterFile='" << parameterfile << "'";
   PyRun_SimpleString( buffer.str().c_str() );
   PyRun_SimpleString( "parser = modelTester.getParameters( parameterFile )" );
-  PyRun_SimpleString( "database, databaseVersion = modelTester.loadDatabase(parser, None, 'info' )" );
+  PyRun_SimpleString( "database, databaseVersion = modelTester.loadDatabase(parser, None )" );
   PyRun_SimpleString( "listOfExpRes = modelTester.loadDatabaseResults(parser, database)" );
   PyRun_SimpleString( "print '[smodels.cpp] %d experimental results found.' % len(listOfExpRes) " );
 }

cpp/parameters.ini

@@ -1,49 +1,61 @@
 #Database address
 [path]
-#databasePath = ../smodels-database/database.pcl ; Give path to the database "text" directory or to the binary database file
-#databasePath = ../smodels-database ; Give path to the database "text" directory or to the binary database file
-databasePath = ../test/database/ ; Give path to the database "text" directory or to the binary database file
+databasePath = ../test/database ; Give path to the database directory or to the binary database file
 
 #Select running mode
 [options]
 inputType = SLHA ;SLHA for a SLHA input file or LHE for a LHE input file
 checkInput = True ;Set True to check the input file for possible errors 
 doInvisible = True ;Set True if invisible compression should be performed, False elsewise
 doCompress = True ;Set True if mass compression should be performed, False elsewise
-testCoverage = True ;Set True if topologies not covered by experiments should be identified, False otherwise
+computeStatistics = True ;Set True to compute likelihood and chi2 for the most sensitive EM result, False elsewise
+testCoverage = True ;Set True if topologies not covered by experiments (missing topologies) should be identified, False otherwise
 
 #Select input parameters
 [parameters]
 sigmacut = 0.03 ;Give minimum cross section value [fb] considered in SLHA decomposition (relevant for SLHA decomposition and detection of missing topologies)
 minmassgap = 5. ;Give minimum mass gap [GeV] for mass compression
 maxcond = 0.2 ;Maximum relative violation of conditions for valid results
-ncpus = -1 ;Give number of cores used when running in parallel (integer, if <1 all availabel CPUs are used)
+ncpus = 1 ;Give number of cores used when running in parallel (integer, -1 means all available CPUs are used)
 
 #Select database analyses
 [database]
 analyses = all ;Set all to use all analyses included in the database
-#to use only specific analyses, give a list of the names, e.g.
-#analyses = CMS-PAS-SUS-13-008,CMS-SUS-13-013,ATLAS-CONF-2013-024,ATLAS-SUSY-2013-04
-#analyses = CMS-SUS-13-004
+#to use only specific analyses, give a list of the names separated by comma
+# analyses = CMS-PAS-SUS-13-008, CMS-SUS-13-013,ATLAS-CONF-2013-024,ATLAS-SUSY-2013-04
+
 txnames= all ;Set all to use all constraints included in the database
-#to use only specific constraints, give a list of the names, e.g.
-#txnames = T2
+#to use only specific constraints, give a list of the names separated by comma
+#txnames = T2,T1,TChiWZ
+
+dataselector= all ; Set all to use all upper limit and efficiency maps results in the database. Set to upperLimit (efficiencyMap) to use only UL (EM) results:
 #dataselector = upperLimit
-dataselector= all ;Allows to select specific data sets (signal regions). Set all to use all upper limit and efficiency maps analyses the database. If None, it will only use the UL results
-#to use only specific signal regions, give a list of the names, e.g.
-#dataselector = ANA11-CUT11
-
-
-#Screen output settings
-[stdout]
-printDecomp = True ;Set True to print a table of topologies after decomposition, False elsewise
-addElmentInfo = True ;Set True to add a table of elements, False elsewise. Note that not all the elements appearing in this table are constrained by experiments.
-printAnalyses = False ;Set True to print the list of analyses used, False elsewise
-addAnaInfo = False ;Set True to add information about each analysis used, False elsewise
-printResults = True ;Set True to print table of results, False elsewise
-outputType = summary,stdout ;Define the output formats
-
-#File output settings
-[file]
+#It can also be used to select specific datasets (signal regions) from efficiency map results. For the latter provide a list of the desired dataset ids
+#dataselector = SRA mCT150,SRA mCT200
+
+#Settings for result printout
+[printer]
+outputType = summary,stdout,python ;Define the output formats
+#available output formats: summary, stdout, log, python, xml (type log redirects stdout in *.log output file)
+
+#options for stdout and log format
+[stdout-printer]
+printDatabase = False ;Set True to print the list of selected experimental results to stdout, False elsewise
+addAnaInfo = False ;Set True to add detailed information about each experimental result selected, False elsewise. Only used if printDatabase = True
+printDecomp = False ;Set True to print a table of all topologies generated by decomposition, False elsewise
+addElementInfo = False ;Set True to print a list of all elements generated by decomposition, False elsewise. Note that not all the elements appearing in this table are constrained by experiments. Only used if printDecomp = True
+printExtendedResults = True ;Set True to print detailed information about the experimental constraints, False to print a shorter version
+addCoverageID = False ;Set True to print the ID of the elements not constrained by the experimental constraints. Only used if testCoverage=True
+
+#options for summary file
+[summary-printer]
 expandedSummary = True ;Set True to print to file all applicable analyses, False for only the strongest result
 
+#options for python printer
+[python-printer]
+addElementList = False ;Set True to print full list of elements to python and xml format, False elsewise. Note that these are all elements after decomposition and the list can be very long.
+
+#options for xml printer
+[xml-printer]
+addElementList = False ;Set True to print full list of elements to python and xml format, False elsewise. Note that these are all elements after decomposition and the list can be very long.
+