Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing typo in tmp filename #20734

Merged
merged 2 commits into from
Oct 5, 2017
Merged

fixing typo in tmp filename #20734

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74acaaa
fixing typo in filename
alberto-sanchez Oct 3, 2017
02159bd
applying clang-tidy
alberto-sanchez Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions GeneratorInterface/EvtGenInterface/plugins/EvtGen/EvtGenInterface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#include "TString.h"
#include <string>
#include <stdlib.h>
#include <cstdlib>
#include <cstdio>

#include "boost/filesystem.hpp"
Expand Down Expand Up @@ -305,7 +305,7 @@ void EvtGenInterface::init(){
//Setup evtGen following instructions on http://evtgen.warwick.ac.uk/docs/external/
bool convertPythiaCodes=fPSet->getUntrackedParameter<bool>("convertPythiaCodes",true); // Specify if we want to use Pythia 6 physics codes for decays
std::string pythiaDir = getenv ("PYTHIA8DATA"); // Specify the pythia xml data directory to use the default PYTHIA8DATA location
if(pythiaDir==NULL){
if(pythiaDir==nullptr){
edm::LogError("EvtGenInterface::~EvtGenInterface") << "EvtGenInterface::init() PYTHIA8DATA not defined. Terminating program ";
exit(0);
}
Expand All @@ -314,7 +314,7 @@ void EvtGenInterface::init(){

// Set up the default external generator list: Photos, Pythia and/or Tauola
EvtExternalGenList genList(convertPythiaCodes, pythiaDir, photonType, useEvtGenRandom);
EvtAbsRadCorr* radCorrEngine=0;
EvtAbsRadCorr* radCorrEngine=nullptr;
if(usePhotos) radCorrEngine = genList.getPhotosModel(); // Get interface to radiative correction engine
std::list<EvtDecayBase*> extraModels = genList.getListOfModels(); // get interface to Pythia and Tauola
std::list<EvtDecayBase*> myExtraModels;
Expand Down Expand Up @@ -363,7 +363,7 @@ void EvtGenInterface::init(){
if (fPSet->exists("user_decay_embedded")){
std::vector<std::string> user_decay_lines = fPSet->getParameter<std::vector<std::string> >("user_decay_embedded");
auto tmp_dir = boost::filesystem::temp_directory_path();
tmp_dir += "%%%%-%%%%-%%%%-%%%%";
tmp_dir += "/%%%%-%%%%-%%%%-%%%%";
auto tmp_path = boost::filesystem::unique_path(tmp_dir);
std::string user_decay_tmp = std::string(tmp_path.c_str());
FILE* tmpf = std::fopen(user_decay_tmp.c_str(), "w");
Expand All @@ -384,7 +384,7 @@ void EvtGenInterface::init(){
std::vector<int> tmpPIDs = fPSet->getParameter< std::vector<int> >("operates_on_particles");
m_PDGs.clear();
bool goodinput=false;
if(tmpPIDs.size()>0){ if(tmpPIDs.size()==1 && tmpPIDs[0]==0) goodinput=false;
if(!tmpPIDs.empty()){ if(tmpPIDs.size()==1 && tmpPIDs[0]==0) goodinput=false;
else goodinput=true;
}
else{goodinput=false;}
Expand Down Expand Up @@ -521,7 +521,7 @@ bool EvtGenInterface::addToHepMC(HepMC::GenParticle* partHep,const EvtId &idEvt,
EvtVector4R vInit(posHep.t(),posHep.x(),posHep.y(),posHep.z());
// Reset polarization if requested....
if(EvtPDL::getSpinType(idEvt) == EvtSpinType::DIRAC && polarizations.count(partHep->pdg_id())>0){
HepMC::FourVector momHep = partHep->momentum();
const HepMC::FourVector& momHep = partHep->momentum();
EvtVector4R momEvt;
momEvt.set(momHep.t(),momHep.x(),momHep.y(),momHep.z());
// Particle is spin 1/2, so we can polarize it. Check polarizations map for particle, grab its polarization if it exists
Expand Down