More tests

Author: forthommel

CHANGELOG

@@ -38,11 +38,11 @@ dataQED_WWexoticSpin0EvenResonances and dataQED_AAexoticSpin2Resonances
 
 2015-01-20 Christophe Royon <[email protected]>, Murilo Rangel <[email protected]>
   * correct for normalisation for reggeon (applied in PDFs and not in flux)
-  
+
 2014-11-26 Christophe Royon <[email protected]>
-  * new code for heavy ion flux (nflux=11) 
+  * new code for heavy ion flux (nflux=11)
   * new cards to transmit BMIN
-  * new code and fluxes for proton ion, ion proton via Pom/Photon exchange 
+  * new code and fluxes for proton ion, ion proton via Pom/Photon exchange
   * bug fix for photon pom
 
 2014-09-11 Matthias Saimpert <[email protected]>
@@ -100,6 +100,6 @@ dataQED_WWexoticSpin0EvenResonances and dataQED_AAexoticSpin2Resonances
     ntuple.
 
 2011-05-09  Oldrich Kepka  <[email protected]>
-  * Tagging version fpmc_v01-05 - cleanup of nutples, version for testing 
+  * Tagging version fpmc_v01-05 - cleanup of nutples, version for testing
 
 

CMakeLists.txt

@@ -3,6 +3,7 @@ project(FPMC)
 set(PROJECT_VERSION 1)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -Wno-deprecated-declarations -pedantic -std=c++11 -g")
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -O1 -fno-automatic -fPIC")
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
 set(MODULES Fpmc Herwig Examples Tests)

Fpmc/interface/herwig.h

@@ -3,7 +3,7 @@
 
 //-------------------------HERWIG common block -------------------------------------
 
-static const int nmxres = 501;
+static const int nmxres = 500;
 static const int nmxsud = 1024; // max number of entries for Sudakov lookup table
 static const int nmxcdk = 4000;
 static const int nmxhep = 4000;
@@ -68,9 +68,9 @@ extern "C"
 
   //--- arrays for particle properties (NMXRES = max no of particles defined)
   typedef struct {
-    double RLTIM[nmxres], RMASS[nmxres], RSPIN[nmxres];
-    int ICHRG[nmxres], IDPDG[nmxres],IFLAV[nmxres], NRES;
-    int VTOCDK[nmxres], VTORDK[nmxres], QORQQB[nmxres], QBORQQ[nmxres]; // starting from 0...
+    double RLTIM[nmxres+1], RMASS[nmxres+1], RSPIN[nmxres+1];
+    int ICHRG[nmxres+1], IDPDG[nmxres+1],IFLAV[nmxres+1], NRES;
+    int VTOCDK[nmxres+1], VTORDK[nmxres+1], QORQQB[nmxres+1], QBORQQ[nmxres+1]; // starting from 0...
   } hwprop_t;
   extern hwprop_t hwprop_;
 
@@ -250,6 +250,8 @@ extern "C"
 #define hwuaem hwuaem_
 
   //---------------------------------------------------------------
+  void hwudat_();
+#define hwudat hwudat_
   void hweini_(); // initialise elementary process
 #define hweini hweini_
   void hwuine_(); // initialise event
@@ -278,6 +280,8 @@ extern "C"
 #define hwmevt hwmevt_
   void hwufne_(); // event generation completed, wrap up event, ...
 #define hwufne hwufne_
+  void hwabeg_();
+#define hwabeg hwabeg_
 
 #ifdef __cplusplus
 }

Fpmc/src/Fpmc.cc

@@ -9,7 +9,7 @@ namespace fpmc
   {}
 
   Fpmc::Fpmc( const char* card ) :
-    herwigVerbosity_( 1 ), maxEventsToPrint_( 2 ),
+    herwigVerbosity_( 5 ), maxEventsToPrint_( 2 ),
     initialised_( false ),
     params_( FpmcParameters::parseCard( card ) ),
     debug_( false ), dbg_( std::cout )
@@ -36,7 +36,10 @@ namespace fpmc
            << "UTYPINT = " << params_.getString( "typint" ) << std::endl
            << "UTMASS  = " << params_.getFloat( "tmass" ) << std::endl;
     }
+    //--- initialise the common blocks
     initHerwig();
+
+    //--- dump the configuration into an output card
     params_.writeCard( "lastrun.card" );
   }
 
@@ -47,9 +50,6 @@ namespace fpmc
 
     dbg_ << "Initializing HERWIG/FPMC" << std::endl;
 
-    //--- call hwudat to set up HERWIG block data
-    //hwudat();
-
     params_.fetchHWBMCH( hwbmch_ );
     params_.fetchHWPROC( hwproc_ );
     params_.fetchPRTYPE( prtype_ );
@@ -61,7 +61,17 @@ namespace fpmc
            << "TYPINT = " << prtype_.TYPINT << "\n"
            << "IPROC  = " << hwproc_.IPROC << "\n";
     }
-    hwigin_();
+    //--- call hwudat to set up HERWIG block data
+//    hwudat();
+std::cout << "aaaaaaaaaaa" << std::endl;
+
+    //--- sets the input parameters
+    hwigin();
+
+    for ( unsigned int i = 0; i < 500; ++i ) {
+      std::cout << "hwprop for particle " << i << ": " << hwprop_.RLTIM[i] << "\t" << hwprop_.RMASS[i] << "\t" << hwprop_.RSPIN[i] << "\t" << hwprop_.ICHRG[i] << "\t" << hwprop_.IDPDG[i] << "\t" << hwprop_.IFLAV[i] << std::endl;
+    }
+//    exit(0);
 
     params_.fetchHWPRAM( hwpram_ );
     hwpram_.IPRINT = herwigVerbosity_;
@@ -98,7 +108,6 @@ namespace fpmc
     params_.fetchHWHARD( hwhard_ );
 
     params_.fetchXSECT( xsect_ );
-std::cout << "--------->" << xsect_.GAPSPR << std::endl;
     params_.fetchPDFS( pdfs_ );
     params_.fetchAAANOMAL( aaanomal_ );
     params_.fetchAAEXOTICAL( aaexotical_ );

Fpmc/src/FpmcParameters.cc

@@ -5,7 +5,7 @@ namespace fpmc
   FpmcParameters::FpmcParameters() :
     std::map<std::string,std::string>( {
       // particles masses
-      { "rmass", "0.0" }, { "wmass", "80.425" }, { "hmass", "125.0" }, { "tmass", "174.3" }, { "mst1", "250.0" }, { "msb1", "250.0" },
+      { "wmass", "80.425" }, { "hmass", "125.0" }, { "tmass", "174.3" }, { "mst1", "250.0" }, { "msb1", "250.0" },
       // kinematics cuts
       { "ecms", "14000.0" }, { "yjmin", "-6.0" }, { "yjmax", "6.0" }, { "ptmin", "0.0" }, { "ptmax", "1.e8" }, { "emmin", "10.0" }, { "emmax", "1.e8" },
       { "ywwmin", "0.0" }, { "ywwmax", "0.1" }, { "q2wwmn", "0.0" }, { "q2wwmx", "4.0" },