Remove stale code used for debugging updates to GReWeightXSecMEC

Author: sjgardiner

src/RwCalculators/GReWeightXSecMEC.cxx

@@ -38,9 +38,6 @@
 #include "RwFramework/GSystSet.h"
 #include "RwFramework/GSystUncertainty.h"
 
-// Standard library includes
-#include <iomanip>
-
 // GNU Scientific library includes
 #include <gsl/gsl_sf_legendre.h>
 
@@ -61,9 +58,6 @@ namespace {
     return temp_map;
   }
 
-// Counter for loop over events
-int current_event = 0;
-
   //// MECGenerator::SelectEmpiricalKinematics() uses bogus hard-coded
   //// limits which are copied below for consistency.
   //// TODO: Do something better in MECGenerator, then change this
@@ -279,24 +273,14 @@ double GReWeightXSecMEC::CalcWeight(const genie::EventRecord& event)
   bool is_mec = event.Summary()->ProcInfo().IsMEC();
   if ( !is_mec ) return 1.;
 
-    current_event++;
-    std::cout << "Event: " << current_event << "                                             <-- New event" << std::endl;
   double weight = this->CalcWeightNorm( event );
-    std::cout << "Weight norm:                " << weight << std::endl;
   weight *= this->CalcWeightAngularDist( event );
-    std::cout << "Weight ang:                 " << weight << std::endl;
   weight *= this->CalcWeightAngularDistLegendre( event );
-    std::cout << "Weight ang Legendre:        " << weight << std::endl;
   weight *= this->CalcWeightPNDelta( event );
-    std::cout << "Weight pndel: " << weight << std::endl;
   weight *= this->CalcWeightXSecShape( event );
-    std::cout << "Weight xsecshape:           " << weight << std::endl;
   weight *= this->CalcWeightXSecShape_Empirical( event );
-    std::cout << "Weight xsecshape_empirical: " << weight << std::endl;
   weight *= this->CalcWeightXSecShape_Martini( event );
-    std::cout << "Weight xsecshape_martini:   " << weight << std::endl;
   weight *= this->CalcWeightEnergyDependence( event );
-    std::cout << "Weight edep:                " << weight << std::endl;
   return weight;
 }
 //_______________________________________________________________________________________
@@ -424,9 +408,7 @@ double GReWeightXSecMEC::CalcWeightAngularDist(const genie::EventRecord& event)
   double twk_dial = std::max( std::min(1., fDecayAngTwkDial), -1. );
   double twk_dial2 = fDecayAng2TwkDial;
 
-  if( twk_dial2 == 0 ) twk_dial2 = 1.0;
-
-  std::cout << "twk_dial = " << twk_dial << ";    twk_dial2 = " << twk_dial2 << std::endl << std::endl;
+  if ( twk_dial2 == 0 ) twk_dial2 = 1.0;
 
   // If the tweak dials are set to zero (or are really small) then just return a
   // weight of unity
@@ -661,8 +643,6 @@ double GReWeightXSecMEC::CalcWeightAngularDistLegendre(const genie::EventRecord&
   // the angle is divided by \Pi/2 and subtracted by 1 such that the argument of P_l(x) is
   // within [-1,1]. The factor 3 is to enhance the effect of the reweighting as P_l(x) < 1.
 
-  std::cout << "Legendre polynomial P_l( " << 1 << " , " << std::cos(theta_N1) << ") = " << gsl_sf_legendre_Pl(1, std::cos(theta_N1)) << std::endl;
-
   double weight = CalcWeightDecayAngMECLegendre(theta_N1, twk_dial, twk_dial2, twk_dial3, twk_dial4, twk_dial5, twk_dial6);
 
   return weight;
@@ -1024,9 +1004,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape(const genie::EventRecord& event)
     // input tune, compute the differential and total cross section of GENIE's
     // Valencia MEC (alternative) model.
 
-    std::cout << "Input (default) CCMEC cross section model name: " << cc_def_alg_name << std::endl;
-    std::cout << "Alternative CCMEC cross section model name:     " << cc_alt_alg_name << std::endl;
-
     diff_xsec_alt = fXSecAlgCCAlt_Nieves->XSec( interaction, kPSTlctl );
     tot_xsec_alt = this->GetXSecIntegral( fXSecAlgCCAlt_Nieves, interaction );
   }
@@ -1035,9 +1012,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape(const genie::EventRecord& event)
     // input tune, compute the differential and total cross section of GENIE's
     // SuSAv2 MEC (alternative) model.
 
-    std::cout << "Input (default) CCMEC cross section model: " << cc_def_alg_name << std::endl;
-    std::cout << "Alternative CCMEC cross section model: " << cc_alt2_alg_name << std::endl;
-
     diff_xsec_alt = fXSecAlgCCAlt_SuSAv2->XSec( interaction, kPSTlctl );
     tot_xsec_alt = this->GetXSecIntegral( fXSecAlgCCAlt_SuSAv2, interaction );
   }
@@ -1046,26 +1020,17 @@ double GReWeightXSecMEC::CalcWeightXSecShape(const genie::EventRecord& event)
     // model from the input tune, compute the differential and total cross section of GENIE's
     // SuSAv2 MEC (alternative) model.
 
-    std::cout << "Input (default) CCMEC cross section model: " << cc_def_alg_name << std::endl;
-    std::cout << "Alternative CCMEC cross section model: " << cc_alt2_alg_name << std::endl;
-
     diff_xsec_alt = fXSecAlgCCAlt_SuSAv2->XSec( interaction, kPSTlctl );
     tot_xsec_alt = this->GetXSecIntegral( fXSecAlgCCAlt_SuSAv2, interaction );
   }
   else {
-    // If the Empirical or any other model is the default CCMEC cross section model
-    // from the input tune, just return a weight of 1 as there are currently no
-    // plans to have either model as the default model.
-
-    LOG("ReW", pWARN) << "MEC xsecshape reweighting for other CCMEC models but SuSAv2 or Valencia model not implemented";
-    std::cout << "Input (default) CCMEC cross section model: Other, i.e. " << cc_def_alg_name << std::endl;
-    std::cout << "MEC xsecshape reweighting for other CCMEC models but SuSAv2, Valencia or Martini-Ericson-Chanfray-Marteau model not implemented" << std::endl;
+    // If the Empirical or any other model is the default CCMEC cross section
+    // model from the input tune, just return a weight of 1 as there are
+    // currently no plans to have either model as the default model.
+    LOG("ReW", pWARN) << "Unrecognized MEC model requested for MEC"
+      " xsec shape reweighting";
   }
 
-  //LOG("RwMEC", pERROR) << "diff_xsec_alt = " << diff_xsec_alt << ", tot_xsec_alt = " << tot_xsec_alt;
-
-  //if ( tot_xsec_alt == 0. && diff_xsec_alt != 0. ) LOG("RwMEC", pERROR) << "OH NO!";
-
   // Protect against NaNs when the total cross section for the alternative
   // model is zero
   if ( tot_xsec_alt == 0. ) {
@@ -1202,12 +1167,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape_Empirical(const genie::EventRecord&
   //double W = interaction->Kine().W();
   //double Q2 = interaction->Kine().Q2();
 
-  //LOG("RwMEC", pERROR) << "NIEVES: W = " << W << ", Q2 = " << Q2;
-  //if ( rW.min <= W && rW.max >= W && rQ2.min <= Q2 && rQ2.max >= Q2 ) {
-
-  std::cout << "Input (default) CCMEC cross section model: " << cc_def_alg_name << std::endl;
-  std::cout << "Alternative CCMEC cross section model: " << cc_alt3_alg_name << std::endl;
-
   // Once the CCMEC Martini model is available, just change fXSecAlgCCAlt3
   // (reweight from SuSAv2 or Valencia to the Empirical model) to
   // fXSecAlgCCAlt4 (reweight from SuSAv2 or Valencia to the Martini model)
@@ -1390,9 +1349,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape_Martini(const genie::EventRecord& e
     // input tune, compute the differential and total cross section of GENIE's
     // Martini-Ericson-Chanfray-Marteau MEC (alternative) model
 
-    std::cout << "Input (default) CCMEC cross section model: " << cc_def_alg_name << std::endl;
-    std::cout << "Alternative CCMEC cross section model: " << cc_alt4_alg_name << std::endl;
-
     diff_xsec_alt = fXSecAlgCCAlt_Martini->XSec( interaction, kPSTlctl );
     tot_xsec_alt = this->GetXSecIntegral( fXSecAlgCCAlt_Martini, interaction );
   }
@@ -1401,9 +1357,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape_Martini(const genie::EventRecord& e
     // input tune, compute the differential and total cross section of GENIE's
     // Valencia MEC (alternative) model
 
-    std::cout << "Input (default) CCMEC cross section model: " << cc_def_alg_name << std::endl;
-    std::cout << "Alternative CCMEC cross section model: " << cc_alt_alg_name << std::endl;
-
     diff_xsec_alt = fXSecAlgCCAlt_Nieves->XSec( interaction, kPSTlctl );
     tot_xsec_alt = this->GetXSecIntegral( fXSecAlgCCAlt_Nieves, interaction );
   }
@@ -1413,8 +1366,6 @@ double GReWeightXSecMEC::CalcWeightXSecShape_Martini(const genie::EventRecord& e
     // plans to have any other model as the default model.
 
     LOG("ReW", pWARN) << "MEC xsecshape reweighting for other CCMEC models but Valencia, SuSAv2 or Martini model not implemented";
-    std::cout << "Input (default) CCMEC cross section model: Other, i.e. " << cc_def_alg_name << std::endl;
-    std::cout << "MEC xsecshape reweighting for other CCMEC models but SuSAv2 or Valencia model not implemented" << std::endl;
   }
 
   //LOG("RwMEC", pERROR) << "diff_xsec_alt = " << diff_xsec_alt << ", tot_xsec_alt = " << tot_xsec_alt;