Skip to content
Snippets Groups Projects
Commit 78e0495d authored by Vadim Kostyukhin's avatar Vadim Kostyukhin :angry: Committed by Graeme Stewart
Browse files

Clean up Coverity issues 14752,13471,12177,12643 (TrkVKalVrtCore-00-03-54)

        * Remove Coverity issues 14752,13471,12177,12643
	* TrkVKalVrtCore-00-03-54

2015-01-23 Vadim Kostyukhin <Vadim.Kostyukhin@cern.ch>

        * Remove compilation warning
	* TrkVKalVrtCore-00-03-53

2015-01-23 Vadim Kostyukhin <Vadim.Kostyukhin@cern.ch>

        * Multiple Coverity issue corrections
	* TrkVKalVrtCore-00-03-52
parent 63a58bb3
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ namespace Trk { ...@@ -41,7 +41,7 @@ namespace Trk {
// //
// temporary vertex in global ref.frame // temporary vertex in global ref.frame
double vrtstp[3]; double vrtstp[3];
long int kfrm, irob; long int irob;
double RobustScale; double RobustScale;
double robres[NTrkM]; double robres[NTrkM];
short int indtrkmc[NTrkM*8]; /* was [300][8] */ short int indtrkmc[NTrkM*8]; /* was [300][8] */
...@@ -49,9 +49,12 @@ namespace Trk { ...@@ -49,9 +49,12 @@ namespace Trk {
double IterationPrecision; double IterationPrecision;
ForCFT(){ ForCFT(){
useMassCnst=0; usePhiCnst=0; useThetaCnst=0; usePointingCnst=0; nmcnst=0;
useMassCnst=0; usePhiCnst=0; useThetaCnst=0; usePointingCnst=0; usePlaneCnst=0;
useAprioriVrt=0; usePassNear=0; icht=0; Ap=Bp=Dp=Cp=0.; useAprioriVrt=0; usePassNear=0; icht=0; Ap=Bp=Dp=Cp=0.;
IterationNumber = 100; IterationPrecision=1.e-3; RobustScale = 1.; irob=0;}; IterationNumber = 100; IterationPrecision=1.e-3; RobustScale = 1.; irob=0;
localbmag=2.0; // Safety: standard magnetic field in ID
};
~ForCFT(){}; ~ForCFT(){};
}; };
......
...@@ -117,7 +117,8 @@ namespace Trk { ...@@ -117,7 +117,8 @@ namespace Trk {
public: public:
VKVertex(); VKVertex();
~VKVertex(); ~VKVertex();
VKVertex(const VKVertex & src); //copy VKVertex(const VKVertex & src); //copy
VKVertex& operator= (const VKVertex & src); //assign
public: // Relative coordinates with respect to refIterV[] public: // Relative coordinates with respect to refIterV[]
double Chi2; // vertex Chi2 double Chi2; // vertex Chi2
......
...@@ -30,37 +30,22 @@ namespace Trk { ...@@ -30,37 +30,22 @@ namespace Trk {
public: public:
vkalDynamicArrays(long int NTrkMax); vkalDynamicArrays(long int NTrkMax);
vkalDynamicArrays(const vkalDynamicArrays& ); //copy
vkalDynamicArrays& operator=(const vkalDynamicArrays& ); //assign
~vkalDynamicArrays(); ~vkalDynamicArrays();
double *get_tt() const;
double *get_part() const;
double *get_parf0() const;
double *get_scale() const;
double *get_dphi() const; double *get_dphi() const;
double *get_eps() const;
double *get_deps() const; double *get_deps() const;
double *get_drho() const; double *get_drho() const;
double *get_dtet() const; double *get_dtet() const;
double *get_phip() const;
double *get_phiv() const;
double *get_zp() const;
double *get_dzp() const; double *get_dzp() const;
double *get_drdp() const;
private: private:
double *tt;
double *part;
double *parf0;
double *scale;
double *dphi; double *dphi;
double *eps;
double *deps; double *deps;
double *drho; double *drho;
double *dtet; double *dtet;
double *phip;
double *phiv;
double *zp;
double *dzp; double *dzp;
double *drdp; long int NSIZE;
}; };
} }
......
...@@ -12,5 +12,4 @@ apply_pattern installed_library ...@@ -12,5 +12,4 @@ apply_pattern installed_library
private private
###macro_append cppflags "" Linux " -pg" #macro_append cppflags " -pedantic-errors"
###macro_append cpplinkflags "" Linux " -pg"
...@@ -292,7 +292,7 @@ int fitVertexCascade( VKVertex * vk, int Pointing) ...@@ -292,7 +292,7 @@ int fitVertexCascade( VKVertex * vk, int Pointing)
// //
// Now standard fit without pointing in cascade but WITH pointing to PV if present // Now standard fit without pointing in cascade but WITH pointing to PV if present
// //
double Chi2Old=0.,Chi2Cur; double Chi2Old=0.,Chi2Cur=0.;
for(Iter=0; Iter<100; Iter++){ for(Iter=0; Iter<100; Iter++){
Chi2Cur=0.; Chi2Cur=0.;
for(iv=0; iv<cascadeEvent_.cascadeNV; iv++){ for(iv=0; iv<cascadeEvent_.cascadeNV; iv++){
......
...@@ -107,7 +107,6 @@ void prcfit( long int *ntrk, double *wm, double *wmfit, double *bmag, double ...@@ -107,7 +107,6 @@ void prcfit( long int *ntrk, double *wm, double *wmfit, double *bmag, double
forcft_1.covvrt[3] = vrte[3]; forcft_1.covvrt[3] = vrte[3];
forcft_1.covvrt[4] = vrte[4]; forcft_1.covvrt[4] = vrte[4];
forcft_1.covvrt[5] = vrte[5]; forcft_1.covvrt[5] = vrte[5];
forcft_1.kfrm = 0;
forcft_1.irob = 0; forcft_1.irob = 0;
forcft_1.IterationNumber = 50; forcft_1.IterationNumber = 50;
forcft_1.IterationPrecision = 1.e-3; forcft_1.IterationPrecision = 1.e-3;
......
...@@ -127,6 +127,41 @@ namespace Trk { ...@@ -127,6 +127,41 @@ namespace Trk {
for( int i=0; i<(int)src.TrackList.size(); i++) TrackList.push_back( new VKTrack(*(src.TrackList[i])) ); for( int i=0; i<(int)src.TrackList.size(); i++) TrackList.push_back( new VKTrack(*(src.TrackList[i])) );
} }
VKVertex& VKVertex::operator= (const VKVertex & src) //Assignment operator
{
if (this!=&src){
Chi2=src.Chi2; // vertex Chi2
useApriorVertex=src.useApriorVertex; //for a priory vertex position knowledge usage
passNearVertex=src.passNearVertex; // needed for "passing near vertex" constraint
passWithTrkCov=src.passWithTrkCov; // Vertex, CovVertex, Charge and derivatives
FVC=src.FVC;
for( int i=0; i<6; i++) {
fitVcov[i] =src.fitVcov[i]; // range[0:5]
apriorVWGT[i] =src.apriorVWGT[i];
if(i>=3) continue;
fitV[i] =src.fitV[i]; // range[0:2]
iniV[i] =src.iniV[i];
cnstV[i] =src.cnstV[i];
refIterV[i]=src.refIterV[i];
refV[i] =src.refV[i];
apriorV[i] =src.apriorV[i];
fitMom[i] = src.fitMom[i];
}
for( int i=0; i<21; i++){
savedVrtMomCov[i]=src.savedVrtMomCov[i];
fitCovXYZMom[i]=src.fitCovXYZMom[i];
}
nextCascadeVrt = 0;
//----- Creation of track copies
TrackList.clear();
tmpArr.clear();
ConstraintList.clear();
for( int i=0; i<(int)src.TrackList.size(); i++) TrackList.push_back( new VKTrack(*(src.TrackList[i])) );
//for( int i=0; i<(int)src.ConstraintList.size(); i++) ConstraintList.push_back( new (*(src.TrackList[i])) );
}
return *this;
}
TWRK::TWRK(){} TWRK::TWRK(){}
TWRK::~TWRK(){} TWRK::~TWRK(){}
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace Trk { namespace Trk {
vkalDynamicArrays::vkalDynamicArrays(long int NTrkMax ) { vkalDynamicArrays::vkalDynamicArrays(long int NTrkMax ) {
NSIZE = NTrkMax;
dphi = new double[NTrkMax]; dphi = new double[NTrkMax];
deps = new double[NTrkMax]; deps = new double[NTrkMax];
drho = new double[NTrkMax]; drho = new double[NTrkMax];
...@@ -15,6 +15,46 @@ vkalDynamicArrays::vkalDynamicArrays(long int NTrkMax ) { ...@@ -15,6 +15,46 @@ vkalDynamicArrays::vkalDynamicArrays(long int NTrkMax ) {
dzp = new double[NTrkMax]; dzp = new double[NTrkMax];
} }
vkalDynamicArrays::vkalDynamicArrays(const vkalDynamicArrays & src ) { //copy
NSIZE=src.NSIZE;
dphi = new double[NSIZE];
deps = new double[NSIZE];
drho = new double[NSIZE];
dtet = new double[NSIZE];
dzp = new double[NSIZE];
for(int i=0; i<NSIZE; i++){
dphi[i]=src.dphi[i];
deps[i]=src.deps[i];
drho[i]=src.drho[i];
dtet[i]=src.dtet[i];
dzp[i] =src.dzp[i];
}
}
vkalDynamicArrays& vkalDynamicArrays::operator= (const vkalDynamicArrays & src ) { //assignment
if (this!=&src) {
NSIZE=src.NSIZE;
if(dphi) delete[] dphi;
if(deps) delete[] deps;
if(drho) delete[] drho;
if(dtet) delete[] dtet;
if(dzp) delete[] dzp;
dphi = new double[NSIZE];
deps = new double[NSIZE];
drho = new double[NSIZE];
dtet = new double[NSIZE];
dzp = new double[NSIZE];
for(int i=0; i<NSIZE; i++){
dphi[i]=src.dphi[i];
deps[i]=src.deps[i];
drho[i]=src.drho[i];
dtet[i]=src.dtet[i];
dzp[i] =src.dzp[i];
}
}
return *this;
}
vkalDynamicArrays::~vkalDynamicArrays() { vkalDynamicArrays::~vkalDynamicArrays() {
delete[] dphi; delete[] dphi;
delete[] deps; delete[] deps;
......
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