Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion GeneratorInterface/ExhumeInterface/src/ExhumeHadronizer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ namespace gen {
(static_cast<Exhume::DiPhoton*>(exhumeProcess_))->SetThetaMin(thetaMin);
sigID = 400;
} else {
sigID = -1;
throw edm::Exception(edm::errors::Configuration, "ExhumeError") << " No valid Exhume Process";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ bool PythiaAllDauVFilter::filter(edm::StreamID, edm::Event& iEvent, const edm::E
int OK(1);
vector<int> vparticles;
vector<bool> foundDaughter(dauIDs.size(), false);
auto dauCollection = &dauIDs;
const std::vector<int>* dauCollection = nullptr;

HepMC::GenEvent* myGenEvent = new HepMC::GenEvent(*(evt->GetEvent()));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class ExternalLHEProducer : public edm::one::EDProducer<edm::BeginRunProducer, e
edm::EDPutTokenT<LHERunInfoProduct> beginRunPutToken_;
class FileCloseSentry {
public:
explicit FileCloseSentry(int fd) : fd_(fd){};
explicit FileCloseSentry(int fd) : fd_(fd) {};

~FileCloseSentry() { close(fd_); }

Expand Down Expand Up @@ -505,7 +505,6 @@ void ExternalLHEProducer::executeScript(std::vector<std::string> const& args, in
close(filedes[1]);
// If the exec succeeds, the read will fail.
while (((rc2 = read(filedes[0], &rc, sizeof(int))) == -1) && (errno == EINTR)) {
rc2 = 0;
}
if ((rc2 == sizeof(int)) && rc) {
throw cms::Exception("ExternalLHEProducer")
Expand Down
11 changes: 6 additions & 5 deletions GeneratorInterface/ReggeGribovPartonMCInterface/src/read.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <cstring>

int main(int numArgs, const char *args[]) {
int res;
// int res;

if (numArgs != 2) {
//PrintHelp(rs);
Expand All @@ -21,10 +21,10 @@ int main(int numArgs, const char *args[]) {
}

LzmaFile lzma;
res = lzma.Open(args[1]);
res = lzma.DecodeAll();
res = lzma.Close();

/*res =*/lzma.Open(args[1]);
/*res =*/lzma.DecodeAll();
/*res =*/lzma.Close();
/*
if (res != SZ_OK) {
if (res == SZ_ERROR_MEM) {
return 0; //PrintError(rs, kCantAllocateMessage);
Expand All @@ -37,5 +37,6 @@ int main(int numArgs, const char *args[]) {
}
return 0; //PrintErrorNumber(rs, res);
}
*/
return 0;
}
2 changes: 0 additions & 2 deletions GeneratorInterface/SherpaInterface/src/SherpackUtilities.cc
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ namespace spu {
printf("%c", buff[ll]);
}
printf("\n");
bytes_read = fread(buff, 1, 512, a);
for (int ll = 0; ll < 512; ll++) {
printf("%c", buff[ll]);
}
Expand All @@ -431,7 +430,6 @@ namespace spu {
}
//~ printf("NEW LinkNAME: %s\n",newlonglinkname);
} else if (buff[156] == 'L') {
bytes_read = fread(buff, 1, 512, a);
for (int k = 0; k < filesize; k++) {
newlongpathname[k] = buff[k];
}
Expand Down