Skip to content
Snippets Groups Projects
Commit bbabc64f authored by Matthias Steinke's avatar Matthias Steinke
Browse files

fixed a number of compiler warnings

parent ef1d3a7e
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@ DecayTree::~DecayTree()
DecayTree::DecayTree(const EdgeList* edgeList)
{
Edge edges[edgeList->decays.size() * 2];
int counter;
unsigned int counter;
for (counter = 0; counter < edgeList->decays.size(); counter++) {
edges[2*counter] = std::pair<int,int>(edgeList->decays[counter]->mother,
edgeList->decays[counter]->daughters[0]);
......
......@@ -32,8 +32,9 @@ DecayTree::DecayTree(const EdgeList* edgeList)
theDecayTree = new Graph(edges, edges+nedges, edgeList->lastVertexNumber);
nameMap = &(const_cast<EdgeList*>(edgeList)->particleNames);
std::cout << "name 0 " << nameMap->find(0)->second <<
" name 1 " << nameMap->find(1)->second << std::endl;
for (counter = 1; counter <= nameMap->size(); ++counter)
std::cout <<
" name " << counter << " " << nameMap->find(counter)->second << std::endl;
}
bool DecayTree::fillParticleRefs(ParticleTable& ptable)
......
......@@ -11,7 +11,7 @@ Event::~Event()
delete *iter;
}
Vector4<float>* Event::p4(int i)
Vector4<float>* Event::p4(unsigned int i)
{
if (particles.size() > i)
return particles[i]->vector4;
......@@ -24,7 +24,7 @@ Vector4<float>* Event::p4(int i)
}
float* Event::pid(int i)
float* Event::pid(unsigned int i)
{
if (particles.size() > i)
return particles[i]->pidVector;
......
......@@ -27,8 +27,8 @@ public:
void addParticle(double e, double px, double py, double pz);
Vector4<float>* p4(int i);
float* pid(int i);
Vector4<float>* p4(unsigned int i);
float* pid(unsigned int i);
int size();
......
......@@ -52,7 +52,7 @@ void EventList::setParticleType(int num, Particle* partRef)
return;
}
Particle* EventList::particle(int num)
Particle* EventList::particle(unsigned int num)
{
if (num >= 0 && num < particleRefs.size())
return particleRefs[num];
......
......@@ -21,7 +21,7 @@ public:
void setParticleType(int num, Particle* partRef);
bool findParticleTypes(ParticleTable& pdtTable);
Particle* particle(int num);
Particle* particle(unsigned int num);
int size();
......
......@@ -9,7 +9,7 @@
#include <vector>
#include <string>
main()
int main()
{
ErrLogger::instance()->setLevel(log4cpp::Priority::INFO);
std::vector<std::string> fileNames;
......
......@@ -57,6 +57,8 @@ struct jpcRes
virtual void print(std::ostream& os) const{
os <<"J=" << J << "\tP=" << P << "\tC=" << C;
}
virtual ~jpcRes(){};
};
......
......@@ -3,20 +3,20 @@
#include "ErrLogger/ErrLogger.hh"
pbarpStates::pbarpStates():
AbsStates(),
_jmax(10),
_pbarJPC(0.5, -1),
_pJPC(0.5, 1),
AbsStates()
_pJPC(0.5, 1)
{
calcJPCs();
}
pbarpStates::pbarpStates(int jmax):
AbsStates(),
_jmax(jmax),
_pbarJPC(0.5, -1),
_pJPC(0.5, 1),
AbsStates()
_pJPC(0.5, 1)
{
calcJPCs();
}
......@@ -85,6 +85,8 @@ bool pbarpStates::calcJPCs(){
}
DebugMsg << "\n" << endmsg;
}
return true;
}
void pbarpStates::fillVec(boost::shared_ptr<const jpcRes> currentRes,
......
......@@ -55,7 +55,8 @@ bool PwaEnv::setup(std::string& setupFileName)
CBElsaReader mcEventReader(setupParser.setup()->mcInput, 3, 1);
theMcEventList = new EventList();
mcEventReader.fillAll(*theMcEventList);
return 1;
}
ParticleTable* PwaEnv::particleTable()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment