diff --git a/geom/geom/src/TGeoHype.cxx b/geom/geom/src/TGeoHype.cxx index 5d655222c1db1cff9689ae470a688476309c40a8..da62c19c7dd0241c47fa245a65c54df24bbe6ce6 100644 --- a/geom/geom/src/TGeoHype.cxx +++ b/geom/geom/src/TGeoHype.cxx @@ -403,10 +403,8 @@ TGeoShape *TGeoHype::GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix * /*mat*/ // in case shape has some negative parameters, these has to be computed // in order to fit the mother if (!TestShapeBit(kGeoRunTimeShape)) return 0; - Double_t rmin, rmax, dz; + Double_t dz; Double_t zmin,zmax; - rmin = fRmin; - rmax = fRmax; dz = fDz; if (fDz<0) { mother->GetAxisRange(3,zmin,zmax); diff --git a/geom/geom/src/TGeoNavigator.cxx b/geom/geom/src/TGeoNavigator.cxx index f77853b246265ce1401b654890bcd8b5a85447fc..46c0bce467995bc5211066ee85f80b288b86c748 100644 --- a/geom/geom/src/TGeoNavigator.cxx +++ b/geom/geom/src/TGeoNavigator.cxx @@ -1676,7 +1676,6 @@ void TGeoNavigator::SafetyOverlaps() Int_t nmany = fNmany; Bool_t crtovlp = kFALSE; Bool_t nextovlp = kFALSE; - TGeoNode *current = fCurrentNode; TGeoNode *mother, *mup; TGeoHMatrix *matrix; while (nmany) { @@ -1691,7 +1690,6 @@ void TGeoNavigator::SafetyOverlaps() matrix->MasterToLocal(fPoint,local); safe = mother->GetVolume()->GetShape()->Safety(local,kTRUE); if (safe<fSafety) fSafety = safe; - current = mother; crtovlp = nextovlp; } up++; @@ -2096,7 +2094,6 @@ Bool_t TGeoNavigator::GotoSafeLevel() Int_t nmany = fNmany; Bool_t ovlp = kFALSE; Bool_t nextovlp = kFALSE; - TGeoNode *current = fCurrentNode; TGeoNode *mother, *mup; TGeoHMatrix *matrix; while (nmany) { @@ -2117,7 +2114,6 @@ Bool_t TGeoNavigator::GotoSafeLevel() return GotoSafeLevel(); } } - current = mother; ovlp = nextovlp; up++; } diff --git a/geom/geom/src/TGeoShape.cxx b/geom/geom/src/TGeoShape.cxx index 0958fc138ef08cbd12babed111a5eb7be7b5aa0e..0dc41cf023eaae96a223f726eb37832f76bfd88d 100644 --- a/geom/geom/src/TGeoShape.cxx +++ b/geom/geom/src/TGeoShape.cxx @@ -502,7 +502,6 @@ void TGeoShape::TransformPoints(Double_t *points, UInt_t NbPnts) const { // Tranform a set of points (LocalToMaster) UInt_t i,j; - Double_t dlocal[3]; Double_t dmaster[3]; if (fgTransform) { for (j = 0; j < NbPnts; j++) { @@ -519,9 +518,6 @@ void TGeoShape::TransformPoints(Double_t *points, UInt_t NbPnts) const for (j = 0; j < NbPnts; j++) { i = 3*j; - dlocal[0] = points[3*j]; - dlocal[1] = points[3*j+1]; - dlocal[2] = points[3*j+2]; if (gGeoManager->IsMatrixTransform()) { TGeoHMatrix *glmat = gGeoManager->GetGLMatrix(); if (bomb) glmat->LocalToMasterBomb(&points[i], dmaster); diff --git a/geom/geom/src/TGeoVoxelFinder.cxx b/geom/geom/src/TGeoVoxelFinder.cxx index f08e00286a3589631dae5d070d8c3d376bf5bc95..a28d211dfdf0dfac12effda48259e81b43ff7cf9 100644 --- a/geom/geom/src/TGeoVoxelFinder.cxx +++ b/geom/geom/src/TGeoVoxelFinder.cxx @@ -1583,7 +1583,10 @@ Bool_t TGeoVoxelFinder::IntersectAndStore(Int_t n1, UChar_t *array1, Int_t tid) Int_t nbytes = 1+((nd-1)>>3); if (!array1) { memset(td.fBits1, 0xFF, nbytes*sizeof(UChar_t)); - while (td.fNcandidates<nd) td.fCheckList[td.fNcandidates++] = td.fNcandidates; + while (td.fNcandidates<nd) { + td.fCheckList[td.fNcandidates] = td.fNcandidates; + ++td.fNcandidates; + } return kTRUE; } memcpy(td.fBits1, array1, nbytes*sizeof(UChar_t)); diff --git a/geom/geompainter/src/TGeoChecker.cxx b/geom/geompainter/src/TGeoChecker.cxx index 6e424604ec529be74e1fac3c97b3230f45b321bf..ff8a05c15a2fe96dc9d86610080b7c6637faa50a 100644 --- a/geom/geompainter/src/TGeoChecker.cxx +++ b/geom/geompainter/src/TGeoChecker.cxx @@ -707,7 +707,6 @@ Double_t TGeoChecker::TimingPerVolume(TGeoVolume *vol) Double_t theta, phi; Int_t idaughter; fTimer->Start(); - Double_t dist; Bool_t inside; for (Int_t i=0; i<1000000; i++) { lpt[0] = ox-dx+2*dx*gRandom->Rndm(); @@ -725,12 +724,12 @@ Double_t TGeoChecker::TimingPerVolume(TGeoVolume *vol) fGeoManager->SetStep(pstep); fGeoManager->ResetState(); inside = kTRUE; - dist = TGeoShape::Big(); + // dist = TGeoShape::Big(); if (!vol->IsAssembly()) { inside = vol->Contains(lpt); if (!inside) { - dist = vol->GetShape()->DistFromOutside(lpt,ldir,3,pstep); -// if (dist>=pstep) continue; + // dist = vol->GetShape()->DistFromOutside(lpt,ldir,3,pstep); + // if (dist>=pstep) continue; } else { vol->GetShape()->DistFromInside(lpt,ldir,3,pstep); } @@ -2111,7 +2110,6 @@ void TGeoChecker::RandomRays(Int_t nrays, Double_t startx, Double_t starty, Doub Double_t start[3]; Double_t dir[3]; - Int_t istep= 0; const Double_t *point = fGeoManager->GetCurrentPoint(); vol->Draw(); printf("Start... %i rays\n", nrays); @@ -2162,7 +2160,6 @@ void TGeoChecker::RandomRays(Int_t nrays, Double_t startx, Double_t starty, Doub if (inull>5) break; normal = fGeoManager->FindNormalFast(); if (!normal) break; - istep = 0; vis2 = endnode->IsOnScreen(); if (ipoint>0) { // old visible node had an entry point -> finish segment diff --git a/graf2d/asimage/src/TASImage.cxx b/graf2d/asimage/src/TASImage.cxx index 50dd613d9dec065d3a9939f6a790bb756e4c5119..0e5d173ff1d5967a8553a54643573c744385aa1a 100644 --- a/graf2d/asimage/src/TASImage.cxx +++ b/graf2d/asimage/src/TASImage.cxx @@ -3817,7 +3817,7 @@ void TASImage::DrawLineInternal(UInt_t x1, UInt_t y1, UInt_t x2, UInt_t y2, int i1, i2; int x, y, xend, yend; int xdir, ydir; - int wid, q; + int q; int idx; int yy; @@ -3862,8 +3862,6 @@ void TASImage::DrawLineInternal(UInt_t x1, UInt_t y1, UInt_t x2, UInt_t y2, return; } - wid = 1; - if (dy <= dx) { UInt_t ddy = dy << 1; i1 = ddy; @@ -5846,7 +5844,7 @@ void TASImage::DrawTextTTF(Int_t x, Int_t y, const char *text, Int_t size, TTGlyph *glyph = TTF::GetGlyphs(); // compute the size and position that will contain the text - Int_t Xoff = 0; if (TTF::GetBox().xMin < 0) Xoff = -TTF::GetBox().xMin; + // Int_t Xoff = 0; if (TTF::GetBox().xMin < 0) Xoff = -TTF::GetBox().xMin; Int_t Yoff = 0; if (TTF::GetBox().yMin < 0) Yoff = -TTF::GetBox().yMin; Int_t h = TTF::GetBox().yMax + Yoff; diff --git a/graf2d/gpad/src/TPad.cxx b/graf2d/gpad/src/TPad.cxx index 7ccbc34afd3795b6f7538013456c53ec1f6221e8..63792b57c0ab98ee7dce7c898c94a23fee3c220a 100644 --- a/graf2d/gpad/src/TPad.cxx +++ b/graf2d/gpad/src/TPad.cxx @@ -533,8 +533,9 @@ void TPad::Clear(Option_t *option) cd(); if (TestBit(kClearAfterCR)) { - int readch; - readch = getchar(); + // Intentional do not use the return value of getchar, + // we just want to get it and forget it + getchar(); } if (!gPad->IsBatch()) GetPainter()->ClearDrawable(); diff --git a/graf2d/graf/src/TCurlyArc.cxx b/graf2d/graf/src/TCurlyArc.cxx index 48ab3e8664522d4fb983a413ad6b923da0abd069..e73cff9e62637a282d0e7e1c5457730012daeb39 100644 --- a/graf2d/graf/src/TCurlyArc.cxx +++ b/graf2d/graf/src/TCurlyArc.cxx @@ -153,7 +153,7 @@ void TCurlyArc::ExecuteEvent(Int_t event, Int_t px, Int_t py) static Int_t px1,py1,npe,r1; static Int_t pxold, pyold; Int_t i, dpx, dpy; - Double_t angle,dx,dy,dphi,rTy,rBy,rLx,rRx; + Double_t angle,dx,dy,dphi,rLx,rRx; Double_t phi0; static Bool_t pTop, pL, pR, pBot, pINSIDE; static Int_t pTx,pTy,pLx,pLy,pRx,pRy,pBx,pBy; @@ -352,8 +352,8 @@ void TCurlyArc::ExecuteEvent(Int_t event, Int_t px, Int_t py) case kButton1Up: fX1 = gPad->AbsPixeltoX(px1); fY1 = gPad->AbsPixeltoY(py1); - rBy = gPad->AbsPixeltoY(py1+r1); - rTy = gPad->AbsPixeltoY(py1-r1); + //rBy = gPad->AbsPixeltoY(py1+r1); + //rTy = gPad->AbsPixeltoY(py1-r1); rLx = gPad->AbsPixeltoX(px1+r1); rRx = gPad->AbsPixeltoX(px1-r1); fR1 = TMath::Abs(rRx-rLx)/2; diff --git a/graf2d/graf/src/TGraphPolargram.cxx b/graf2d/graf/src/TGraphPolargram.cxx index b9298e773a07f60fc6dc62efa80963689845e98a..f7c3738d1980ab4024f61b811987bdd8c1643b9d 100644 --- a/graf2d/graf/src/TGraphPolargram.cxx +++ b/graf2d/graf/src/TGraphPolargram.cxx @@ -196,7 +196,7 @@ void TGraphPolargram::ExecuteEvent(Int_t event, Int_t px, Int_t py) // Indicate that there is something to click here. Int_t kMaxDiff = 20; - static Int_t d1, d2, d3, px1, py1, px3, py3, px4, py4; + static Int_t d1, d2, d3, px1, py1, px3, py3; static Bool_t p1, p2, p3, p4, p5, p6, p7, p8; Double_t px2, py2; p2 = p3 = p4 = p5 = p6 = p7 = p8 = kFALSE; @@ -237,8 +237,8 @@ void TGraphPolargram::ExecuteEvent(Int_t event, Int_t px, Int_t py) case kButton1Down: // Record initial coordinates - px4 = px; - py4 = py; + //px4 = px; + //py4 = py; case kButton1Motion: if (p1) { diff --git a/graf2d/graf/src/TPaveText.cxx b/graf2d/graf/src/TPaveText.cxx index 1e93f5f41b6084a16f00ee83c1291c388d94d095..4b628982cd7f54fd9b4a01356fef0b5c07b8eff7 100644 --- a/graf2d/graf/src/TPaveText.cxx +++ b/graf2d/graf/src/TPaveText.cxx @@ -455,11 +455,6 @@ void TPaveText::PaintPrimitives(Int_t mode) if (mode == kDiamond) textsize *= 0.66; SetTextSize(textsize); } - Double_t yfont; - if (GetTextFont()%10 > 2) - yfont = (gPad->PixeltoY(Int_t(-textsize))-gPad->PixeltoY(0))/(y2-y1)*dy; - else - yfont = textsize*dy; Double_t ytext = fY2 + 0.5*yspace; Double_t xtext = 0; Int_t halign; diff --git a/graf2d/graf/src/TPie.cxx b/graf2d/graf/src/TPie.cxx index 677ddd2fd7d7d8b3b64bdd0b4bed564e22e98d50..a2a7382321811cd0c838ed4cbc7eb993b2982616 100644 --- a/graf2d/graf/src/TPie.cxx +++ b/graf2d/graf/src/TPie.cxx @@ -310,12 +310,9 @@ void TPie::DrawGhost() MakeSlices(); // XY metric - Double_t radX = fRadius; - Double_t radY = fRadius; Double_t radXY = 1.; if (fIs3D) { radXY = TMath::Sin(fAngle3D/180.*TMath::Pi()); - radY = radXY*radX; } for (Int_t i=0;i<fNvals&&fIs3D==kTRUE;++i) { @@ -441,12 +438,9 @@ void TPie::ExecuteEvent(Int_t event, Int_t px, Int_t py) const Double_t angstep8 = 7.5*TMath::PiOver4(); // XY metric - Double_t radX = fRadius; - Double_t radY = fRadius; Double_t radXY = 1.; if (fIs3D==kTRUE) { radXY = TMath::Sin(fAngle3D/180.*TMath::Pi()); - radY = radXY*radX; } Int_t dx, dy; diff --git a/graf2d/postscript/src/TImageDump.cxx b/graf2d/postscript/src/TImageDump.cxx index 93a8d783293a30cdbb7fd49522ae7ad505c84279..f67b15b5b4671784004553f501ab428ff7ab5f65 100644 --- a/graf2d/postscript/src/TImageDump.cxx +++ b/graf2d/postscript/src/TImageDump.cxx @@ -211,14 +211,13 @@ void TImageDump::DrawFrame(Double_t x1, Double_t y1, Double_t x2, Double_t y2, } Short_t pxl,pyl,pxt,pyt,px1,py1,px2,py2; - Double_t xl, xt, yl, yt; px1 = XtoPixel(x1); py1 = YtoPixel(y1); px2 = XtoPixel(x2); py2 = YtoPixel(y2); - if (px1 < px2) {pxl = px1; pxt = px2; xl = x1; xt = x2; } - else {pxl = px2; pxt = px1; xl = x2; xt = x1;} - if (py1 > py2) {pyl = py1; pyt = py2; yl = y1; yt = y2;} - else {pyl = py2; pyt = py1; yl = y2; yt = y1;} + if (px1 < px2) {pxl = px1; pxt = px2;} + else {pxl = px2; pxt = px1;} + if (py1 > py2) {pyl = py1; pyt = py2;} + else {pyl = py2; pyt = py1;} if (bordersize == 1) { col = gROOT->GetColor(fLineColor); diff --git a/graf3d/eve/src/TEveCaloLegoGL.cxx b/graf3d/eve/src/TEveCaloLegoGL.cxx index 81edd64be8f1eae5b2d7cf376c1d3baac68bbcd6..0bee1db21f14c7312d07bf8eb59e8d23884439ef 100644 --- a/graf3d/eve/src/TEveCaloLegoGL.cxx +++ b/graf3d/eve/src/TEveCaloLegoGL.cxx @@ -1227,7 +1227,7 @@ void TEveCaloLegoGL::DrawSelectedCells(TGLRnrCtx & rnrCtx, TEveCaloData::vCellId for (vCell2D_i i = fCells2D.begin(); i != fCells2D.end(); ++i) { TEveCaloData::CellId_t cell = fM->fCellList[i->fId]; - std::set<Int_t>::iterator ti = towers.find(cell.fTower); + // std::set<Int_t>::iterator ti = towers.find(cell.fTower); if (towers.find(cell.fTower) != towers.end()) { cells2DSelected.push_back(*i); diff --git a/graf3d/eve/src/TEveStraightLineSetGL.cxx b/graf3d/eve/src/TEveStraightLineSetGL.cxx index 11aa197b3fe9cf4790934a577a02350c9b9bcf13..e76a521424adc6a9e36e09d0dd35af2f7fb4d0e7 100644 --- a/graf3d/eve/src/TEveStraightLineSetGL.cxx +++ b/graf3d/eve/src/TEveStraightLineSetGL.cxx @@ -102,7 +102,7 @@ void TEveStraightLineSetGL::DirectDraw(TGLRnrCtx& rnrCtx) const glDisable(GL_LIGHTING); TGLUtil::LineWidth(mL.GetLineWidth()); if (mL.GetLineStyle() > 1) { - Int_t fac = 1; + // Int_t fac = 1; UShort_t pat = 0xffff; switch (mL.GetLineStyle()) { case 2: pat = 0x3333; break; @@ -113,7 +113,7 @@ void TEveStraightLineSetGL::DirectDraw(TGLRnrCtx& rnrCtx) const case 7: pat = 0xf0f0; break; case 8: pat = 0xff11; break; case 9: pat = 0x3fff; break; - case 10: pat = 0x08ff; fac = 2; break; + case 10: pat = 0x08ff; /* fac = 2; */ break; } glLineStipple(1, pat); glEnable(GL_LINE_STIPPLE); diff --git a/graf3d/eve/src/TEveTrackPropagator.cxx b/graf3d/eve/src/TEveTrackPropagator.cxx index fb6ec2df5f91dcc6c74d1c3770a5677f1181f163..59f8145be188963c1c42141240af413dbd2324d2 100644 --- a/graf3d/eve/src/TEveTrackPropagator.cxx +++ b/graf3d/eve/src/TEveTrackPropagator.cxx @@ -1014,7 +1014,7 @@ void TEveTrackPropagator::StepRungeKutta(Double_t step, /// ****************************************************************** Double_t h2, h4, f[4]; - Double_t xyzt[3], a, b, c, ph,ph2; + Double_t /* xyzt[3], */ a, b, c, ph,ph2; Double_t secxs[4],secys[4],seczs[4],hxp[3]; Double_t g1, g2, g3, g4, g5, g6, ang2, dxt, dyt, dzt; Double_t est, at, bt, ct, cba; @@ -1104,9 +1104,9 @@ void TEveTrackPropagator::StepRungeKutta(Double_t step, continue; } - xyzt[0] = xt; - xyzt[1] = yt; - xyzt[2] = zt; + // xyzt[0] = xt; + // xyzt[1] = yt; + // xyzt[2] = zt; fH.fB = fMagFieldObj->GetFieldD(xt, yt, zt); f[0] = -fH.fB.fX; @@ -1143,9 +1143,9 @@ void TEveTrackPropagator::StepRungeKutta(Double_t step, continue; } - xyzt[0] = xt; - xyzt[1] = yt; - xyzt[2] = zt; + // xyzt[0] = xt; + // xyzt[1] = yt; + // xyzt[2] = zt; fH.fB = fMagFieldObj->GetFieldD(xt, yt, zt); f[0] = -fH.fB.fX; diff --git a/graf3d/gl/src/TGLAxis.cxx b/graf3d/gl/src/TGLAxis.cxx index 524a6517da6459b0ee6a6ed7743950207d08dd18..43389fc61bfd2a7a454c84fe63a9063faccff13d 100644 --- a/graf3d/gl/src/TGLAxis.cxx +++ b/graf3d/gl/src/TGLAxis.cxx @@ -303,10 +303,10 @@ void TGLAxis::TicksPositions(Option_t *opt) { // Compute ticks positions. - Bool_t optionNoopt, optionLog; + Bool_t optionNoopt /* , optionLog */; if (strchr(opt,'N')) optionNoopt = kTRUE; else optionNoopt = kFALSE; - if (strchr(opt,'G')) optionLog = kTRUE; else optionLog = kFALSE; + // if (strchr(opt,'G')) optionLog = kTRUE; else optionLog = kFALSE; // Determine number of tick marks 1, 2 and 3. fNDiv3 = fNDiv/10000; diff --git a/graf3d/gl/src/TGLUtil.cxx b/graf3d/gl/src/TGLUtil.cxx index 5511272efe121a4ef8cfce9bdd68a9aca9420570..875a1f36b48ed6500380c5ede6a429c235717815 100644 --- a/graf3d/gl/src/TGLUtil.cxx +++ b/graf3d/gl/src/TGLUtil.cxx @@ -2082,7 +2082,7 @@ void TGLUtil::BeginAttLine(const TAttLine& aline, Char_t transp, TGLUtil::LineWidth(aline.GetLineWidth()); if (aline.GetLineStyle() > 1) { - Int_t fac = 1; + // Int_t fac = 1; UShort_t pat = 0xffff; switch (aline.GetLineStyle()) { case 2: pat = 0x3333; break; @@ -2093,7 +2093,7 @@ void TGLUtil::BeginAttLine(const TAttLine& aline, Char_t transp, case 7: pat = 0xf0f0; break; case 8: pat = 0xff11; break; case 9: pat = 0x3fff; break; - case 10: pat = 0x08ff; fac = 2; break; + case 10: pat = 0x08ff; /* fac = 2; */ break; } glLineStipple(1, pat); diff --git a/gui/ged/src/TPieEditor.cxx b/gui/ged/src/TPieEditor.cxx index 905d6728c047c8680ff4703880f93abbc576590b..73fb8f9537349d51a9111171baac2f4eb8537996 100644 --- a/gui/ged/src/TPieEditor.cxx +++ b/gui/ged/src/TPieEditor.cxx @@ -188,8 +188,6 @@ void TPieEditor::SetModel(TObject* obj) TString soption = GetDrawOption(); - bool optionSame(kFALSE); - // For the label orientation there are 3 possibilities: // 0: horizontal // 1: radial @@ -200,7 +198,7 @@ void TPieEditor::SetModel(TObject* obj) Int_t idx; // Paint the TPie in an existing canvas if ( (idx=soption.Index("same"))>=0 ) { - optionSame = kTRUE; + // optionSame = kTRUE; soption.Remove(idx,4); } diff --git a/gui/gui/src/TGButton.cxx b/gui/gui/src/TGButton.cxx index ef964ef356db6a4f2241d5d7ceab5d834bebb014..cdb9d4603999f3c4c74b7f1d79fc68a3e0101db6 100644 --- a/gui/gui/src/TGButton.cxx +++ b/gui/gui/src/TGButton.cxx @@ -1377,14 +1377,13 @@ void TGCheckButton::DoRedraw() { // Draw the check button widget. - int x, y, y0, cw; + int x, y, y0; TGFrame::DoRedraw(); x = 20; y = (fHeight - fTHeight) >> 1; - cw = 13; y0 = !fTHeight ? 0 : y + 1; if (fOn && fOff) { Int_t smax = TMath::Max(fOn->GetHeight(), fOff->GetHeight()); diff --git a/gui/gui/src/TGComboBox.cxx b/gui/gui/src/TGComboBox.cxx index 5e239e97bb561e1667273ef2406fbbee2948a048..fe0e512c75b9ba7a62c0e4dd019f23999099e8f3 100644 --- a/gui/gui/src/TGComboBox.cxx +++ b/gui/gui/src/TGComboBox.cxx @@ -347,7 +347,7 @@ void TGComboBox::EnableTextInput(Bool_t on) { // Switch text input or readonly mode of combobox (not perfect yet). - UInt_t w, h; + // UInt_t w, h; const char *text = ""; Pixel_t back = TGFrame::GetWhitePixel(); // default @@ -359,8 +359,8 @@ void TGComboBox::EnableTextInput(Bool_t on) fTextEntry->SetText(text); } RemoveFrame(fSelEntry); - w = fSelEntry->GetWidth(); - h = fSelEntry->GetHeight(); + //w = fSelEntry->GetWidth(); + //h = fSelEntry->GetHeight(); fSelEntry->DestroyWindow(); delete fSelEntry; fSelEntry = 0; @@ -381,8 +381,8 @@ void TGComboBox::EnableTextInput(Bool_t on) text = fTextEntry->GetText(); RemoveFrame(fTextEntry); fTextEntry->DestroyWindow(); - w = fTextEntry->GetWidth(); - h = fTextEntry->GetHeight(); + //w = fTextEntry->GetWidth(); + //h = fTextEntry->GetHeight(); delete fTextEntry; fTextEntry = 0; } diff --git a/gui/gui/src/TGFileBrowser.cxx b/gui/gui/src/TGFileBrowser.cxx index 2f4d5be4bdde3cc7e8f87bc8466839400527dfda..ed73a80804fe69521536ac7a0ab524677da0ac9a 100644 --- a/gui/gui/src/TGFileBrowser.cxx +++ b/gui/gui/src/TGFileBrowser.cxx @@ -423,9 +423,7 @@ void TGFileBrowser::AddRemoteFile(TObject *obj) // Add remote file in list tree. Bool_t is_link; - Int_t type, uid, gid; - Long_t modtime; - Long64_t size; + Int_t type; TString filename; const TGPicture *spic; TGPicture *pic; @@ -433,10 +431,6 @@ void TGFileBrowser::AddRemoteFile(TObject *obj) FileStat_t sbuf; type = 0; - size = 0; - uid = 0; - gid = 0; - modtime = 0; is_link = kFALSE; TRemoteObject *robj = (TRemoteObject *)obj; @@ -444,10 +438,6 @@ void TGFileBrowser::AddRemoteFile(TObject *obj) robj->GetFileStat(&sbuf); is_link = sbuf.fIsLink; type = sbuf.fMode; - size = sbuf.fSize; - uid = sbuf.fUid; - gid = sbuf.fGid; - modtime = sbuf.fMtime; filename = robj->GetName(); if (R_ISDIR(type) || fFilter == 0 || (fFilter && filename.Index(*fFilter) != kNPOS)) { diff --git a/gui/gui/src/TGListTree.cxx b/gui/gui/src/TGListTree.cxx index 46a82232edca5770c72e40244cc9c9b92d18c0fe..8f0f1faf5f04c81f067c2ed69a687790d4417b69 100644 --- a/gui/gui/src/TGListTree.cxx +++ b/gui/gui/src/TGListTree.cxx @@ -922,7 +922,6 @@ Bool_t TGListTree::HandleKey(Event_t *event) // action. char input[10]; - Int_t n; UInt_t keysym; TGListTreeItem *item = 0; @@ -931,7 +930,6 @@ Bool_t TGListTree::HandleKey(Event_t *event) if (event->fType == kGKeyPress) { gVirtualX->LookupString(event, input, sizeof(input), keysym); - n = strlen(input); if (!event->fState && (EKeySym)keysym == kKey_Escape) { if (gDNDManager->IsDragging()) gDNDManager->EndDrag(); @@ -1474,7 +1472,7 @@ void TGListTree::DrawItem(Handle_t id, TGListTreeItem *item, Int_t x, Int_t y, // Draw list tree item. Int_t xpic1, ypic1, xbranch, ybranch, xtext, ytext, xline, yline, xc; - Int_t xpic2 = 0, ypic2 = 0; + Int_t xpic2 = 0; UInt_t height; const TGPicture *pic1 = item->GetPicture(); const TGPicture *pic2 = item->GetCheckBoxPicture(); @@ -1488,10 +1486,8 @@ void TGListTree::DrawItem(Handle_t id, TGListTreeItem *item, Int_t x, Int_t y, if (pic2->GetHeight() > height) { ytext = y + (Int_t)((pic2->GetHeight() - height) >> 1); height = pic2->GetHeight(); - ypic2 = y; } else { ytext = y; - ypic2 = y + (Int_t)((height - pic2->GetHeight()) >> 1); } if (pic1) xpic2 = xpic1 + pic1->GetWidth() + 1; else xpic2 = xpic1 + 1; diff --git a/gui/gui/src/TGSplitFrame.cxx b/gui/gui/src/TGSplitFrame.cxx index 16456fcc144147e2dafadc5aead117610cbe12e4..22d54aea4c3d57dc00076498df584c634ae14cb2 100644 --- a/gui/gui/src/TGSplitFrame.cxx +++ b/gui/gui/src/TGSplitFrame.cxx @@ -230,9 +230,9 @@ void TGSplitTool::Show(Int_t x, Int_t y) gVirtualX->GrabPointer(fId, kButtonPressMask | kPointerMotionMask, kNone, fClient->GetResourcePool()->GetGrabCursor(), kTRUE, kFALSE); - Long_t args[2]; - args[0] = x; - args[1] = y; + // Long_t args[2]; + // args[0] = x; + // args[1] = y; } //______________________________________________________________________________ diff --git a/gui/gui/src/TGTable.cxx b/gui/gui/src/TGTable.cxx index cbc622ac9be3585d1e0b84593898b8310a4aabdf..6c50e51edf1dac712be0e31675687ee0d6c8ab79 100644 --- a/gui/gui/src/TGTable.cxx +++ b/gui/gui/src/TGTable.cxx @@ -723,12 +723,8 @@ void TGTable::ResizeTable(UInt_t newnrows, UInt_t newncolumns) UInt_t oldnrows = GetNTableRows(); UInt_t oldncolumns = GetNTableColumns(); - UInt_t oldwidth = 0, oldheight = 0; Int_t i = 0, j = 0; - oldwidth = GetCHdrWidth(); - oldheight = GetRHdrHeight(); - TGCompositeFrame *container = (TGCompositeFrame *)fCanvas->GetContainer(); if (newnrows != oldnrows){ diff --git a/gui/gui/src/TGTextEditor.cxx b/gui/gui/src/TGTextEditor.cxx index 271c9eb9d36617a25c876f04e90ea9da75286197..65e5b564704c48ce0a4ff4483e4389c1890a01db 100644 --- a/gui/gui/src/TGTextEditor.cxx +++ b/gui/gui/src/TGTextEditor.cxx @@ -657,12 +657,10 @@ Bool_t TGTextEditor::HandleKey(Event_t *event) // Keyboard event handler. char input[10]; - Int_t n; UInt_t keysym; if (event->fType == kGKeyPress) { gVirtualX->LookupString(event, input, sizeof(input), keysym); - n = strlen(input); switch ((EKeySym)keysym) { // ignore these keys case kKey_Shift: diff --git a/gui/gui/src/TGToolTip.cxx b/gui/gui/src/TGToolTip.cxx index 77b91cf312b06ed2cef1ae2c6859445c9574c3f6..5941c49a7baea41dfbb0547752bf9d252a73097b 100644 --- a/gui/gui/src/TGToolTip.cxx +++ b/gui/gui/src/TGToolTip.cxx @@ -282,7 +282,7 @@ Bool_t TGToolTip::HandleTimer(TTimer *) { // If tool tip delay timer times out show tool tip window. - Int_t x = 0, y = 0, px1 = 0, px2 = 0, py1 = 0, py2 = 0; + Int_t x = 0, y = 0, px1 = 0, px2 = 0, py1 = 0; Window_t wtarget; if (fWindow) { @@ -295,12 +295,12 @@ Bool_t TGToolTip::HandleTimer(TTimer *) px1 = fPad->XtoAbsPixel(fBox->GetX1()); px2 = fPad->XtoAbsPixel(fBox->GetX2()); py1 = fPad->YtoAbsPixel(fBox->GetY1()); - py2 = fPad->YtoAbsPixel(fBox->GetY2()); + // py2 = fPad->YtoAbsPixel(fBox->GetY2()); } else { px1 = fPad->XtoAbsPixel(fPad->GetX1()); px2 = fPad->XtoAbsPixel(fPad->GetX2()); py1 = fPad->YtoAbsPixel(fPad->GetY1()); - py2 = fPad->YtoAbsPixel(fPad->GetY2()); + // py2 = fPad->YtoAbsPixel(fPad->GetY2()); } gVirtualX->TranslateCoordinates(gVirtualX->GetWindowID(fPad->GetCanvasID()), GetParent()->GetId(), diff --git a/gui/gui/src/TRootBrowser.cxx b/gui/gui/src/TRootBrowser.cxx index 8d96bb875547edb834a8793ee4a1c1fac316e00b..3dade039c20b63f2e8e0c0c1cad8305f0f077e2e 100644 --- a/gui/gui/src/TRootBrowser.cxx +++ b/gui/gui/src/TRootBrowser.cxx @@ -572,12 +572,10 @@ Bool_t TRootBrowser::HandleKey(Event_t *event) // Handle keyboard events. char input[10]; - Int_t n; UInt_t keysym; if (event->fType == kGKeyPress) { gVirtualX->LookupString(event, input, sizeof(input), keysym); - n = strlen(input); if (!event->fState && (EKeySym)keysym == kKey_F5) { Refresh(kTRUE); diff --git a/gui/gui/src/TRootBrowserLite.cxx b/gui/gui/src/TRootBrowserLite.cxx index 7f3eee0df5cff5f51bb8619148244482e27eddc6..51d282ec1332842abf81895e1b2c7bed1d450684 100644 --- a/gui/gui/src/TRootBrowserLite.cxx +++ b/gui/gui/src/TRootBrowserLite.cxx @@ -1437,17 +1437,15 @@ void TRootBrowserLite::AddToTree(TObject *obj, const char *name, Int_t check) fLt->SetToolTipItem(item, tip.Data()); } else { // special case for remote object - Bool_t isRemote = kFALSE; - if (obj->InheritsFrom("TRemoteObject")) - isRemote = kTRUE; - else if (fListLevel) { + if (obj->InheritsFrom("TRemoteObject")) { + // Nothing to do + } else if (fListLevel) { // check also if one of its parents is a remote object TGListTreeItem *top = fListLevel; while (top->GetParent()) { TObject *tobj = (TObject *) top->GetUserData(); if (tobj && (tobj->InheritsFrom("TRemoteObject") || tobj->InheritsFrom("TApplicationRemote"))) { - isRemote = kTRUE; break; } top = top->GetParent(); diff --git a/gui/gui/src/TRootDialog.cxx b/gui/gui/src/TRootDialog.cxx index e19ea105df643d8cd0456577489c644aaf34edf7..3e8441d62a1ee75e80d84cd890159de32132bb79 100644 --- a/gui/gui/src/TRootDialog.cxx +++ b/gui/gui/src/TRootDialog.cxx @@ -291,11 +291,9 @@ Bool_t TRootDialog::HandleKey(Event_t* event) { // The key press event handler in this dialog. - Int_t n; char tmp[10]; UInt_t keysym; gVirtualX->LookupString(event, tmp, sizeof(tmp), keysym); - n = strlen(tmp); if ((EKeySym)keysym == kKey_Tab) { TGTextEntry *entry; diff --git a/gui/guihtml/src/TGHtmlDraw.cxx b/gui/guihtml/src/TGHtmlDraw.cxx index 05033d0e899f7b4806e42135edf58c3c848e879f..6c51514499f8f7511371a189256966e0786fdc8a 100755 --- a/gui/guihtml/src/TGHtmlDraw.cxx +++ b/gui/guihtml/src/TGHtmlDraw.cxx @@ -618,8 +618,6 @@ TGHtmlElement *TGHtml::FillOutBlock(TGHtmlBlock *p) TGHtmlElement *pElem; int go, i, n, x, y; SHtmlStyle_t style; - int firstSelected; // First selected character in this block - int lastSelected; // Last selected character in this block char zBuf[2000]; // Reset n and z @@ -629,9 +627,6 @@ TGHtmlElement *TGHtml::FillOutBlock(TGHtmlBlock *p) if (p->fZ) delete[] p->fZ; p->fZ = 0; - firstSelected = 1000000; - lastSelected = -1; - // Skip over TGHtmlElements that aren't directly displayed. pElem = p->fPNext; @@ -861,7 +856,7 @@ void TGHtml::DrawTableBgnd(int l, int t, int w, int h, // Draw table background //int mx, my, sh, sw, sx, sy, hd; - int iw, ih, dl, dt, dr, db, left, top, right, bottom; + int dl, dt, dr, db, left, top, right, bottom; left = l - fVisible.fX; top = t - fVisible.fY; @@ -875,10 +870,10 @@ void TGHtml::DrawTableBgnd(int l, int t, int w, int h, bottom = top + h - 1; if (dr == 0 && db == 0) { dr = right; db = bottom; } if (left > dr || right < dl || top > db || bottom < dt) return; - iw = image->GetWidth(); - ih = image->GetHeight(); #if 0 + int iw = image->GetWidth(); + int ih = image->GetHeight(); if (iw < 4 && ih < 4) return; // CPU burners we ignore. sx = (left + _visibleStart.x) % iw; // X offset within image to start from sw = iw - sx; // Width of section of image to draw. @@ -898,8 +893,8 @@ void TGHtml::DrawTableBgnd(int l, int t, int w, int h, if (!image->GetPixmap()) return; GContext_t gc = GetAnyGC(); GCValues_t gcv; - unsigned int mask = kGCTile | kGCFillStyle | - kGCTileStipXOrigin | kGCTileStipYOrigin; + // unsigned int mask = kGCTile | kGCFillStyle | + // kGCTileStipXOrigin | kGCTileStipYOrigin; gcv.fTile = image->GetPixmap(); gcv.fFillStyle = kFillTiled; gcv.fTsXOrigin = -fVisible.fX - fDirtyLeft; @@ -908,7 +903,7 @@ void TGHtml::DrawTableBgnd(int l, int t, int w, int h, gVirtualX->FillRectangle(pixmap, gc, left - dl, top - dt, w, h); - mask = kGCFillStyle; + // mask = kGCFillStyle; gcv.fFillStyle = kFillSolid; gVirtualX->ChangeGC(gc, &gcv); #endif diff --git a/gui/guihtml/src/TGHtmlForm.cxx b/gui/guihtml/src/TGHtmlForm.cxx index 3699e150a6f6752318e7295c46e94cd39522c622..20bc108ea7fba574f25c8d7b05c7a00a8e1c77ce 100755 --- a/gui/guihtml/src/TGHtmlForm.cxx +++ b/gui/guihtml/src/TGHtmlForm.cxx @@ -500,10 +500,10 @@ int TGHtml::ControlSize(TGHtmlInput *pElem) case INPUT_TYPE_TextArea: { pElem->fCnt = ++fNInput; - const char *z = pElem->MarkupArg("rows", 0); + // const char *z = pElem->MarkupArg("rows", 0); //int rows = z ? atoi(z) : 10; // coverity[returned_pointer] - z = pElem->MarkupArg("cols", 0); + // z = pElem->MarkupArg("cols", 0); //int cols = z ? atoi(z) : 10; TGTextEdit *f = new TGTextEdit(fCanvas, 300, 200, pElem->fCnt); TGString str(""); diff --git a/gui/guihtml/src/TGHtmlParse.cxx b/gui/guihtml/src/TGHtmlParse.cxx index d49a3c193353cc700f276c9a358ab96e618bdc32..182932394321cc3a407bb652dfc84850df0f5f3c 100755 --- a/gui/guihtml/src/TGHtmlParse.cxx +++ b/gui/guihtml/src/TGHtmlParse.cxx @@ -575,9 +575,11 @@ int TGHtml::Tokenize() char *argv[mxARG]; // Pointers to each markup argument. int arglen[mxARG]; // Length of each markup argument //int rl, ol; +#ifdef pIsInMeachnism int pIsInScript = 0; int pIsInNoScript = 0; int pIsInNoFrames = 0; +#endif int sawdot = 0; int inLi = 0; @@ -648,7 +650,7 @@ int TGHtml::Tokenize() n = i; } else { -#if 0 +#ifdef pIsInMeachnism // If there is a script, execute it now and insert any output // to the html stream for parsing as html. (ie. client side scripting) @@ -678,10 +680,10 @@ int TGHtml::Tokenize() memmove(z + n, result, rl); } } -#endif pIsInScript = 0; pIsInNoScript = 0; pIsInNoFrames = 0; +#endif } //continue; @@ -940,14 +942,20 @@ makeMarkupEntry: case Html_NOFRAMES: if (!fHasFrames) break; +#ifdef pIsInMeachnism pIsInNoFrames = 1; +#endif case Html_NOSCRIPT: break; // coverity[unreachable] if (!fHasScript) break; +#ifdef pIsInMeachnism pIsInNoScript = 1; +#endif case Html_SCRIPT: +#ifdef pIsInMeachnism pIsInScript = 1; +#endif // fallthrough case Html_STYLE: fPScript = (TGHtmlScript *) pElem; diff --git a/gui/guihtml/src/TGHtmlSizer.cxx b/gui/guihtml/src/TGHtmlSizer.cxx index dae090e0cdf2c62439e8ce4b9a09d709d7ed8f72..7a1afe7a14c0d56b17ebd8371e4bb3626c5b2065 100755 --- a/gui/guihtml/src/TGHtmlSizer.cxx +++ b/gui/guihtml/src/TGHtmlSizer.cxx @@ -348,9 +348,9 @@ void TGHtml::AddStyle(TGHtmlElement *p) SetupBackgroundPic(img->GetPicture()); #else GCValues_t gcv; - unsigned int mask; + // unsigned int mask; - mask = kGCTile | kGCFillStyle | kGCGraphicsExposures; + // mask = kGCTile | kGCFillStyle | kGCGraphicsExposures; gcv.fTile = img->GetPixmap(); gcv.fFillStyle = kFillTiled; gcv.fGraphicsExposures = kTRUE; @@ -567,7 +567,7 @@ void TGHtml::AddStyle(TGHtmlElement *p) const char *zUrl; const char *zMethod; TGString cmd(""); - int result; + // int result; char zToken[50]; fFormStart = 0; @@ -587,7 +587,7 @@ void TGHtml::AddStyle(TGHtmlElement *p) cmd.Append(" { "); AppendArglist(&cmd, (TGHtmlMarkupElement *) p); cmd.Append("} "); - result = FormCreate(form, zUrl, cmd.GetString()); + /* result = */ FormCreate(form, zUrl, cmd.GetString()); delete[] zUrl; /*if (result)*/ fFormStart = form; diff --git a/gui/guihtml/src/TGHtmlTable.cxx b/gui/guihtml/src/TGHtmlTable.cxx index 354752b84f60d66aacfac1a47a90c4a43876626d..c0925c4320715da801a26ff45b97c15213634eca 100755 --- a/gui/guihtml/src/TGHtmlTable.cxx +++ b/gui/guihtml/src/TGHtmlTable.cxx @@ -378,7 +378,6 @@ TGHtmlElement *TGHtml::TableDimensions(TGHtmlTable *pStart, int lineWidth) int iCol1 = 0; // Current column number. 1..N int iRow = 0; // Current row number TGHtmlElement *inRow = 0; // Pointer to <TR> - TGHtmlElement *inCol = 0; // Pointer to <TD> int i, j; // Loop counters int n; // Number of columns int minW, maxW, requestedW; // min, max, requested width for a cell @@ -390,7 +389,7 @@ TGHtmlElement *TGHtml::TableDimensions(TGHtmlTable *pStart, int lineWidth) int cellPadding; // Value of CELLPADDING parameter int tbw; // Width of border around whole table int cbw; // Width of border around one cell - int hspace; // Value of HSPACE parameter + // int hspace; // Value of HSPACE parameter int separation; // Space between columns int margin; // Space between left margin and 1st col int availWidth=0; // Part of lineWidth still available @@ -451,7 +450,7 @@ TGHtmlElement *TGHtml::TableDimensions(TGHtmlTable *pStart, int lineWidth) margin = tbw + cellSpacing + cbw + cellPadding; z = pStart->MarkupArg("hspace", 0); - hspace = z ? atoi(z) : DFLT_HSPACE; + // hspace = z ? atoi(z) : DFLT_HSPACE; // Figure out the maximum space available z = pStart->MarkupArg("width", 0); @@ -485,7 +484,7 @@ TGHtmlElement *TGHtml::TableDimensions(TGHtmlTable *pStart, int lineWidth) case Html_EndTH: case Html_EndTABLE: ((TGHtmlRef *)p)->fPOther = pStart; - inCol = 0; + // inCol = 0; break; case Html_EndTR: @@ -510,7 +509,7 @@ TGHtmlElement *TGHtml::TableDimensions(TGHtmlTable *pStart, int lineWidth) case Html_TD: case Html_TH: { TGHtmlCell *cell = (TGHtmlCell *) p; - inCol = p; + // inCol = p; if (!inRow) { // If the <TR> markup is omitted, insert it. TGHtmlElement *pNew = new TGHtmlRef(Html_TR, 1, 0, 0); @@ -1122,7 +1121,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) TGHtmlElement *p; // For looping thru elements of the table TGHtmlElement *fPNext; // Next element in the loop TGHtmlElement *pCaption=0; // Start of the caption text. The <caption> - TGHtmlElement *pEndCaption; // End of the caption. The </caption> + // TGHtmlElement *pEndCaption; // End of the caption. The </caption> int width; // Width of the table as drawn int cellSpacing; // Value of cellspacing= parameter to <table> int cellPadding; // Value of cellpadding= parameter to <table> @@ -1141,7 +1140,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) int iCol; // Current column number int colspan; // Number of columns spanned by current cell int vspace; // Value of the vspace= parameter to <table> - int hspace; // Value of the hspace= parameter to <table> + // int hspace; // Value of the hspace= parameter to <table> int rowBottom; // Bottom edge of content in the current row int defaultVAlign; // Default vertical alignment for the current row const char *zAlign; // Value of the ALIGN= attribute of the <TABLE> @@ -1151,7 +1150,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) int w[N]; // Width of each cell's content int ymax[N]; // Bottom edge of cell's content if valign=top TGHtmlElement *apElem[N]; // The <td> or <th> for each cell in a row - int firstRow[N]; // First row on which a cell appears + // int firstRow[N]; // First row on which a cell appears int lastRow[N]; // Row to which each cell span's int valign[N]; // Vertical alignment for each cell TGHtmlLayoutContext savedContext; // Saved copy of the original pLC @@ -1225,14 +1224,14 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) vspace = z ? atoi(z) : DFLT_VSPACE; z = pTable->MarkupArg("hspace", 0); - hspace = z ? atoi(z) : DFLT_HSPACE; + // hspace = z ? atoi(z) : DFLT_HSPACE; #ifdef DEBUG if (HtmlTraceMask & HtmlTrace_Table4) { cellPadding = 5; cellSpacing = 2; if (vspace < 2) vspace = 2; - if (hspace < 2) hspace = 2; + // if (hspace < 2) hspace = 2; } #endif @@ -1304,7 +1303,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) // Begin rendering rows of the table for (i = 1; i <= n; i++) { - firstRow[i] = 0; + // firstRow[i] = 0; lastRow[i] = 0; apElem[i] = 0; } @@ -1320,7 +1319,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) if (p->fType == Html_CAPTION) { pCaption = p; while (p && p != pEnd1 && p->fType != Html_EndCAPTION) p = p->fPNext; - pEndCaption = p; + // pEndCaption = p; } TRACE(HtmlTrace_Table3, ("Skipping token %s\n", fHtml->GetTokenName(p))); @@ -1365,7 +1364,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) } else { lastRow[iCol] = iRow + cell->fRowspan - 1; } - firstRow[iCol] = iRow; + // firstRow[iCol] = iRow; // Set vertical alignment flag for this cell valign[iCol] = p->GetVerticalAlignment(defaultVAlign); @@ -1438,7 +1437,7 @@ TGHtmlElement *TGHtmlLayoutContext::TableLayout(TGHtmlTable *pTable) while (fPNext && fPNext != pEnd1 && fPNext->fType != Html_EndCAPTION) { fPNext = fPNext->fPNext; } - pEndCaption = fPNext; + // pEndCaption = fPNext; break; } } diff --git a/gui/sessionviewer/src/TProofProgressMemoryPlot.cxx b/gui/sessionviewer/src/TProofProgressMemoryPlot.cxx index 98e33e7067035443112e41fa2c00898f257e79e7..5605d7164cbc569e2b9e51c50456bbe77f22dd7d 100644 --- a/gui/sessionviewer/src/TProofProgressMemoryPlot.cxx +++ b/gui/sessionviewer/src/TProofProgressMemoryPlot.cxx @@ -447,16 +447,12 @@ TGraph *TProofProgressMemoryPlot::DoAveragePlot(Int_t &max_el, Int_t &min_el) ielem=0; Int_t iline=0; Double_t cur_av; - Long64_t nev; - Long64_t nextevent = Long64_t(10E16); while ((ple = (TProofLogElem*)next())){ const char *role = ple->GetRole(); if (role[0]!='w') continue; TList *lines = ple->GetMacro()->GetListOfLines(); if (!lines || lines->GetSize() <= 0) continue; TIter prev(lines, kIterBackward); - nev = 0; - nextevent = Long64_t(10E16); iline=0; cur_av = 0; while ((curline = (TObjString*)prev()) && iline<last[ielem]){ diff --git a/hist/hist/src/HFitImpl.cxx b/hist/hist/src/HFitImpl.cxx index df41c7808f28ff6a6f7a93222fd63f355a2ec599..1ee2905685b295b60399330811f670342e8b555a 100644 --- a/hist/hist/src/HFitImpl.cxx +++ b/hist/hist/src/HFitImpl.cxx @@ -732,7 +732,9 @@ TFitResultPtr ROOT::Fit::UnBinFit(ROOT::Fit::UnBinData * fitdata, TF1 * fitfunc, bool fitok = false; fitok = fitter->Fit(*fitdata); - + if ( !fitok && !fitOption.Quiet ) + Warning("UnBinFit","Abnormal termination of minimization."); + const ROOT::Fit::FitResult & fitResult = fitter->Result(); // one could set directly the fit result in TF1 int iret = fitResult.Status(); diff --git a/hist/hist/src/TBackCompFitter.cxx b/hist/hist/src/TBackCompFitter.cxx index 226ed0485a9dc345c495009cfb9c74adfb68ef5d..dd56d5e4bf2cd6d820dc3603d98da7eb0944347f 100644 --- a/hist/hist/src/TBackCompFitter.cxx +++ b/hist/hist/src/TBackCompFitter.cxx @@ -125,9 +125,6 @@ Int_t TBackCompFitter::ExecuteCommand(const char *command, Double_t *args, Int_t std::cout<<"Execute command= "<<command<<std::endl; #endif - int nfcn = GetMaxIterations(); - double edmval = GetPrecision(); - // set also number of parameters in obj function DoSetDimension(); @@ -136,8 +133,6 @@ Int_t TBackCompFitter::ExecuteCommand(const char *command, Double_t *args, Int_t // MIGRAD if (scommand.Contains("MIG")) { - if (nargs > 0) nfcn = int ( args[0] ); - if (nargs > 1) edmval = args[1]; if (!fObjFunc) { Error("ExecuteCommand","FCN must set before executing this command"); return -1; @@ -145,17 +140,12 @@ Int_t TBackCompFitter::ExecuteCommand(const char *command, Double_t *args, Int_t fFitter->Config().SetMinimizer(GetDefaultFitter(), "Migrad"); bool ret = fFitter->FitFCN(*fObjFunc); - return (ret) ? 0 : -1; - - - + return (ret) ? 0 : -1; } + //Minimize if (scommand.Contains("MINI")) { - if (nargs > 0) nfcn = int ( args[0] ); - if (nargs > 1) edmval = args[1]; - fFitter->Config().SetMinimizer(GetDefaultFitter(), "Minimize"); if (!fObjFunc) { Error("ExecuteCommand","FCN must set before executing this command"); @@ -167,8 +157,6 @@ Int_t TBackCompFitter::ExecuteCommand(const char *command, Double_t *args, Int_t //Simplex if (scommand.Contains("SIM")) { - if (nargs > 0) nfcn = int ( args[0] ); - if (nargs > 1) edmval = args[1]; if (!fObjFunc) { Error("ExecuteCommand","FCN must set before executing this command"); return -1; @@ -181,8 +169,6 @@ Int_t TBackCompFitter::ExecuteCommand(const char *command, Double_t *args, Int_t //SCan if (scommand.Contains("SCA")) { - if (nargs > 0) nfcn = int ( args[0] ); - if (nargs > 1) edmval = args[1]; if (!fObjFunc) { Error("ExecuteCommand","FCN must set before executing this command"); return -1; diff --git a/hist/hist/src/TH1.cxx b/hist/hist/src/TH1.cxx index df4f29f9c03098533b30d4fdda933e9b71db10fa..e3dbd87250ba340c8bbd0f0c811871675107d89d 100644 --- a/hist/hist/src/TH1.cxx +++ b/hist/hist/src/TH1.cxx @@ -2061,7 +2061,7 @@ Double_t TH1::Chi2TestX(const TH1* h2, Double_t &chi2, Int_t &ndf, Int_t &igood for (i=i_start; i<=i_end; i++) { for (j=j_start; j<=j_end; j++) { for (k=k_start; k<=k_end; k++) { - Int_t x=0, y=0; + Int_t x=0; bin1 = this->GetBinContent(i,j,k); bin2 = h2->GetBinContent(i,j,k); err2 = h2->GetBinError(i,j,k); @@ -2101,7 +2101,6 @@ Double_t TH1::Chi2TestX(const TH1* h2, Double_t &chi2, Int_t &ndf, Int_t &igood sum1++; bin1++; x++; - y=1; var1 = sum2*bin2 - sum1*err2; var2 = var1*var1 + 4*sum2*sum2*bin1*err2; } @@ -2110,14 +2109,12 @@ Double_t TH1::Chi2TestX(const TH1* h2, Double_t &chi2, Int_t &ndf, Int_t &igood sum1++; bin1++; x++; - y=1; var1 = sum2*bin2 - sum1*err2; var2 = var1*var1 + 4*sum2*sum2*bin1*err2; while (var1*var1+bin1 == 0 || var1+var2 == 0) { sum1++; bin1++; x++; - y=1; var1 = sum2*bin2 - sum1*err2; var2 = var1*var1 + 4*sum2*sum2*bin1*err2; } diff --git a/hist/histpainter/src/TPainter3dAlgorithms.cxx b/hist/histpainter/src/TPainter3dAlgorithms.cxx index ae66d639c2a04d7de78d0cad9127af0289dd8355..a6764def1f3859dc07db336e297f6f62c2e34bc6 100644 --- a/hist/histpainter/src/TPainter3dAlgorithms.cxx +++ b/hist/histpainter/src/TPainter3dAlgorithms.cxx @@ -2133,7 +2133,7 @@ void TPainter3dAlgorithms::LegoFunction(Int_t ia, Int_t ib, Int_t &nv, Double_t // Service function for Legos Int_t i, j, ixt, iyt; - Double_t xval1l, xval2l, yval1l, yval2l; + Double_t yval1l, yval2l; Double_t xlab1l, xlab2l, ylab1l, ylab2l; Double_t rinrad = gStyle->GetLegoInnerR(); Double_t dangle = 10; //Delta angle for Rapidity option @@ -2161,8 +2161,8 @@ void TPainter3dAlgorithms::LegoFunction(Int_t ia, Int_t ib, Int_t &nv, Double_t if (ab[5] > 0) ab[5] = TMath::Log10(ab[5]); else ab[5] = Hparam.xmin; } - xval1l = Hparam.xmin; - xval2l = Hparam.xmax; + // xval1l = Hparam.xmin; + // xval2l = Hparam.xmax; if (Hoption.Logy) { if (ab[4] > 0) ab[4] = TMath::Log10(ab[4]); else ab[4] = Hparam.ymin; @@ -3748,7 +3748,7 @@ void TPainter3dAlgorithms::SurfaceFunction(Int_t ia, Int_t ib, Double_t *f, Doub Double_t rinrad = gStyle->GetLegoInnerR(); Double_t dangle = 10; //Delta angle for Rapidity option - Double_t xval1l, xval2l, yval1l, yval2l; + Double_t yval1l, yval2l; Double_t xlab1l, xlab2l, ylab1l, ylab2l; Int_t i, ixa, iya, icx, ixt, iyt; @@ -3759,8 +3759,8 @@ void TPainter3dAlgorithms::SurfaceFunction(Int_t ia, Int_t ib, Double_t *f, Doub ixt = ia + Hparam.xfirst - 1; iyt = ib + Hparam.yfirst - 1; - xval1l = Hparam.xmin; - xval2l = Hparam.xmax; + // xval1l = Hparam.xmin; + // xval2l = Hparam.xmax; yval1l = Hparam.ymin; yval2l = Hparam.ymax; diff --git a/math/foam/src/TFoam.cxx b/math/foam/src/TFoam.cxx index ed427b3b333b0bd668de367f71e4ffd0ae534319..83b84fff1904a239b8b76054c4131dc3ec8cde44 100644 --- a/math/foam/src/TFoam.cxx +++ b/math/foam/src/TFoam.cxx @@ -757,16 +757,16 @@ void TFoam::Varedu(Double_t ceSum[5], Int_t &kBest, Double_t &xBest, Double_t &y //________________________________________________________________________________________ void TFoam::Carver(Int_t &kBest, Double_t &xBest, Double_t &yBest) { -// Internal subrogram used by Initialize. -// Determines the best edge-candidate and the position of the division plane -// for the future cell division, in the case of the optimization of the maximum weight. -// It exploits results of the cell MC exploration run stored in fHistEdg. - + // Internal subrogram used by Initialize. + // Determines the best edge-candidate and the position of the division plane + // for the future cell division, in the case of the optimization of the maximum weight. + // It exploits results of the cell MC exploration run stored in fHistEdg. + Int_t kProj,iBin; - Double_t carve,carvTot,carvMax,carvOne,binMax,binTot,primTot,primMax; + Double_t carve,carvTot,carvMax,carvOne,binMax,binTot; Int_t jLow,jUp,iLow,iUp; Double_t theBin; - Int_t jDivi; // TEST + // Int_t jDivi; // TEST Int_t j; Double_t *bins = new Double_t[fNBin]; // bins of histogram for single PROJECTION @@ -776,80 +776,80 @@ void TFoam::Carver(Int_t &kBest, Double_t &xBest, Double_t &yBest) xBest =0.5; yBest =1.0; carvMax = gVlow; - primMax = gVlow; + // primMax = gVlow; for(kProj=0; kProj<fDim; kProj++) - if( fMaskDiv[kProj] ){ - //if( kProj==1 ){ - //cout<<"==================== Carver histogram: kProj ="<<kProj<<"==================="<<endl; - //((TH1D *)(*fHistEdg)[kProj])->Print("all"); - binMax = gVlow; - for(iBin=0; iBin<fNBin;iBin++){ - bins[iBin]= ((TH1D *)(*fHistEdg)[kProj])->GetBinContent(iBin+1); - binMax = TMath::Max( binMax, bins[iBin]); // Maximum content/bin - } - if(binMax < 0 ) { //case of empty cell - delete [] bins; - return; - } - carvTot = 0.0; - binTot = 0.0; - for(iBin=0;iBin<fNBin;iBin++){ - carvTot = carvTot + (binMax-bins[iBin]); // Total Carve (more stable) - binTot +=bins[iBin]; - } - primTot = binMax*fNBin; - //cout <<"Carver: CarvTot "<<CarvTot<< " primTot "<<primTot<<endl; - jLow =0; - jUp =fNBin-1; - carvOne = gVlow; - Double_t yLevel = gVlow; - for(iBin=0; iBin<fNBin;iBin++) { - theBin = bins[iBin]; - //----- walk to the left and find first bin > theBin - iLow = iBin; - for(j=iBin; j>-1; j-- ) { - if(theBin< bins[j]) break; - iLow = j; + if( fMaskDiv[kProj] ) { + //if( kProj==1 ){ + //cout<<"==================== Carver histogram: kProj ="<<kProj<<"==================="<<endl; + //((TH1D *)(*fHistEdg)[kProj])->Print("all"); + binMax = gVlow; + for(iBin=0; iBin<fNBin;iBin++){ + bins[iBin]= ((TH1D *)(*fHistEdg)[kProj])->GetBinContent(iBin+1); + binMax = TMath::Max( binMax, bins[iBin]); // Maximum content/bin } - //iLow = iBin; - //if(iLow>0) while( (theBin >= bins[iLow-1])&&(iLow >0) ){iLow--;} // horror!!! - //------ walk to the right and find first bin > theBin - iUp = iBin; - for(j=iBin; j<fNBin; j++) { - if(theBin< bins[j]) break; - iUp = j; + if(binMax < 0 ) { //case of empty cell + delete [] bins; + return; } - //iUp = iBin; - //if(iUp<fNBin-1) while( (theBin >= bins[iUp+1])&&( iUp<fNBin-1 ) ){iUp++;} // horror!!! - // - carve = (iUp-iLow+1)*(binMax-theBin); - if( carve > carvOne) { - carvOne = carve; - jLow = iLow; - jUp = iUp; - yLevel = theBin; + carvTot = 0.0; + binTot = 0.0; + for(iBin=0;iBin<fNBin;iBin++){ + carvTot = carvTot + (binMax-bins[iBin]); // Total Carve (more stable) + binTot +=bins[iBin]; } - }//iBin - if( carvTot > carvMax) { - carvMax = carvTot; - primMax = primTot; - //cout <<"Carver: primMax "<<primMax<<endl; - kBest = kProj; // Best edge - xBest = ((Double_t)(jLow))/fNBin; - yBest = ((Double_t)(jUp+1))/fNBin; - if(jLow == 0 ) xBest = yBest; - if(jUp == fNBin-1) yBest = xBest; - // division ratio in units of 1/fNBin, testing - jDivi = jLow; - if(jLow == 0 ) jDivi=jUp+1; - } - //====== extra histograms for debug purposes - //cout<<"kProj= "<<kProj<<" jLow= "<<jLow<<" jUp= "<<jUp<<endl; - for(iBin=0; iBin<fNBin; iBin++) - ((TH1D *)(*fHistDbg)[kProj])->SetBinContent(iBin+1,binMax); - for(iBin=jLow; iBin<jUp+1; iBin++) - ((TH1D *)(*fHistDbg)[kProj])->SetBinContent(iBin+1,yLevel); - }//kProj + // primTot = binMax*fNBin; + //cout <<"Carver: CarvTot "<<CarvTot<< " primTot "<<primTot<<endl; + jLow =0; + jUp =fNBin-1; + carvOne = gVlow; + Double_t yLevel = gVlow; + for(iBin=0; iBin<fNBin;iBin++) { + theBin = bins[iBin]; + //----- walk to the left and find first bin > theBin + iLow = iBin; + for(j=iBin; j>-1; j-- ) { + if(theBin< bins[j]) break; + iLow = j; + } + //iLow = iBin; + //if(iLow>0) while( (theBin >= bins[iLow-1])&&(iLow >0) ){iLow--;} // horror!!! + //------ walk to the right and find first bin > theBin + iUp = iBin; + for(j=iBin; j<fNBin; j++) { + if(theBin< bins[j]) break; + iUp = j; + } + //iUp = iBin; + //if(iUp<fNBin-1) while( (theBin >= bins[iUp+1])&&( iUp<fNBin-1 ) ){iUp++;} // horror!!! + // + carve = (iUp-iLow+1)*(binMax-theBin); + if( carve > carvOne) { + carvOne = carve; + jLow = iLow; + jUp = iUp; + yLevel = theBin; + } + }//iBin + if( carvTot > carvMax) { + carvMax = carvTot; + //primMax = primTot; + //cout <<"Carver: primMax "<<primMax<<endl; + kBest = kProj; // Best edge + xBest = ((Double_t)(jLow))/fNBin; + yBest = ((Double_t)(jUp+1))/fNBin; + if(jLow == 0 ) xBest = yBest; + if(jUp == fNBin-1) yBest = xBest; + // division ratio in units of 1/fNBin, testing + // jDivi = jLow; + // if(jLow == 0 ) jDivi=jUp+1; + } + //====== extra histograms for debug purposes + //cout<<"kProj= "<<kProj<<" jLow= "<<jLow<<" jUp= "<<jUp<<endl; + for(iBin=0; iBin<fNBin; iBin++) + ((TH1D *)(*fHistDbg)[kProj])->SetBinContent(iBin+1,binMax); + for(iBin=jLow; iBin<jUp+1; iBin++) + ((TH1D *)(*fHistDbg)[kProj])->SetBinContent(iBin+1,yLevel); + }//kProj if( (kBest >= fDim) || (kBest<0) ) Error("Carver", "Something wrong with kBest \n" ); delete [] bins; } //TFoam::Carver @@ -942,7 +942,6 @@ Int_t TFoam::Divide(TFoamCell *cell) // and their properties set with help of MC sampling (TFoam_Explore) // Returns Code RC=-1 of buffer limit is reached, fLastCe=fnBuf. - Double_t xdiv; Int_t kBest; if(fLastCe+1 >= fNCells) Error("Divide", "Buffer limit is reached, fLastCe=fnBuf \n"); @@ -950,7 +949,6 @@ Int_t TFoam::Divide(TFoamCell *cell) cell->SetStat(0); // reset cell as inactive fNoAct--; - xdiv = cell->GetXdiv(); kBest = cell->GetBest(); if( kBest<0 || kBest>=fDim ) Error("Divide", "Wrong kBest \n"); diff --git a/math/mathcore/src/BinData.cxx b/math/mathcore/src/BinData.cxx index 4b79252bf6eff4ad1451e79fbb3aac968a29b659..241f9e7eee6244bf08b77d6ed8cde58f1db17aea 100644 --- a/math/mathcore/src/BinData.cxx +++ b/math/mathcore/src/BinData.cxx @@ -457,25 +457,25 @@ BinData & BinData::LogTransform() { while (ip < fNPoints ) { assert( itr != data.end() ); DataItr valitr = itr + fDim; - double val = *(itr+fDim); + double val = *(valitr); if (val <= 0) { MATH_ERROR_MSG("BinData::TransformLog","Some points have negative values - cannot apply a log transformation"); // return an empty data-sets Resize(0); return *this; } - *(itr+fDim) = std::log(val); + *(valitr) = std::log(val); // change also errors to 1/val * err if (type == kNoError ) { // insert new error value - DataItr errpos = data.insert(itr+fDim+1,val); + DataItr errpos = data.insert(valitr+1,val); // need to get new iterators for right position itr = errpos - fDim -1; //std::cout << " itr " << *(itr) << " itr +1 " << *(itr+1) << std::endl; } else if (type == kValueError) { // new weight = val * old weight - *(itr+fDim+1) *= val; + *(valitr+1) *= val; } else { // other case (error in value is stored) : new error = old_error/value diff --git a/math/mathcore/src/TRandom.cxx b/math/mathcore/src/TRandom.cxx index 1d83aafdf16745ad3a0251b2aed676b1776ca812..2436cfb12a62c2ea0b0a538578b4278a48b6c185 100644 --- a/math/mathcore/src/TRandom.cxx +++ b/math/mathcore/src/TRandom.cxx @@ -547,12 +547,9 @@ void TRandom::RndmArray(Int_t n, Float_t *array) // Return an array of n random numbers uniformly distributed in ]0,1] const Double_t kCONS = 4.6566128730774E-10; // (1/pow(2,31)) - const Int_t kMASK24 = 0x7fffff00; - UInt_t jy; Int_t i=0; while (i<n) { fSeed = (1103515245 * fSeed + 12345) & 0x7fffffffUL; - jy = (fSeed&kMASK24); // Set lower 8 bits to zero to assure exact float if (fSeed) {array[i] = Float_t(kCONS*fSeed); i++;} } } diff --git a/math/matrix/src/TMatrixTSparse.cxx b/math/matrix/src/TMatrixTSparse.cxx index f90abdbdd6f377ce7982aac40ea59d1eb9e85575..5c8728172aad8c94f52c3378b76ccc1696ec0ea5 100644 --- a/math/matrix/src/TMatrixTSparse.cxx +++ b/math/matrix/src/TMatrixTSparse.cxx @@ -1660,7 +1660,6 @@ TMatrixTBase<Element> &TMatrixTSparse<Element>::ResizeTo(Int_t row_lwb,Int_t row Int_t nelems_copy = 0; rowIndex_new[0] = 0; - Bool_t cont = kTRUE; const Int_t row_off = rowLwb_old-row_lwb; const Int_t col_off = colLwb_old-col_lwb; for (Int_t irow = 0; irow < nrows_old; irow++) { @@ -1676,7 +1675,6 @@ TMatrixTBase<Element> &TMatrixTSparse<Element>::ResizeTo(Int_t row_lwb,Int_t row nelems_copy++; } if (nelems_copy >= nelems_new) { - cont = kFALSE; break; } } diff --git a/math/minuit/src/TLinearFitter.cxx b/math/minuit/src/TLinearFitter.cxx index aeac7a1a7c19a2b8c159ebd912375c40a311d832..46b57aa8f6d7bd37651bdac63fd7f256d42dc4b5 100644 --- a/math/minuit/src/TLinearFitter.cxx +++ b/math/minuit/src/TLinearFitter.cxx @@ -1475,7 +1475,6 @@ void TLinearFitter::SetFormula(const char *formula) Int_t size, special = 0; Int_t i; - Bool_t isHyper = kFALSE; //Int_t len = strlen(formula); if (fInputFunction) fInputFunction = 0; @@ -1487,7 +1486,7 @@ void TLinearFitter::SetFormula(const char *formula) char *fstring; fstring = (char *)strstr(fFormula, "hyp"); if (fstring!=0){ - isHyper = kTRUE; + // isHyper = kTRUE; fstring+=3; sscanf(fstring, "%d", &size); //+1 for the constant term diff --git a/math/splot/src/TSPlot.cxx b/math/splot/src/TSPlot.cxx index a5f7677dad282639b81746ee97e73cc58f5912d3..e21f149a261350b06e50b40facc5192e173132d1 100644 --- a/math/splot/src/TSPlot.cxx +++ b/math/splot/src/TSPlot.cxx @@ -1001,7 +1001,7 @@ void TSPlot::SetTreeSelection(const char* varexp, const char *selection, Long64_ TList *formulaList = new TList(); TSelectorDraw *selector = (TSelectorDraw*)(((TTreePlayer*)fTree->GetPlayer())->GetSelector()); - Long64_t entry,entryNumber, curentry; + Long64_t entry, entryNumber; Int_t i,nch; Int_t ncols; TObjArray *leaves = fTree->GetListOfLeaves(); @@ -1098,7 +1098,7 @@ void TSPlot::SetTreeSelection(const char* varexp, const char *selection, Long64_ xvars[i] = var[i]->EvalInstance(inst); } - curentry = entry-firstentry; + // curentry = entry-firstentry; //printf("event#%d\n", curentry); //for (i=0; i<ncols; i++) // printf("xvars[%d]=%f\n", i, xvars[i]); diff --git a/proof/proof/src/TProofServ.cxx b/proof/proof/src/TProofServ.cxx index c143f559ee4a08575dfa7dc63f716502a562ba6c..f38db3edd2edec71f6d0e19cf8dfb6dbd9a21e4c 100644 --- a/proof/proof/src/TProofServ.cxx +++ b/proof/proof/src/TProofServ.cxx @@ -4131,7 +4131,7 @@ void TProofServ::ProcessNext(TString *slb) TList *input = 0; Long64_t nentries = -1, first = 0; - TObject *elist = 0; + // TObject *elist = 0; TProofQueryResult *pq = 0; // Process @@ -4162,12 +4162,12 @@ void TProofServ::ProcessNext(TString *slb) Error("ProcessNext", "no TDset object: cannot continue"); return; } - elist = 0; - if ((o = pq->GetInputObject("TEntryList"))) - elist = o; - else if ((o = pq->GetInputObject("TEventList"))) - elist = o; - // + // elist = 0; + // if ((o = pq->GetInputObject("TEntryList"))) + // elist = o; + // else if ((o = pq->GetInputObject("TEventList"))) + // elist = o; + // Expand selector files if (pq->GetSelecImp()) { gSystem->Exec(TString::Format("%s %s", kRM, pq->GetSelecImp()->GetName())); diff --git a/tmva/src/DataSetFactory.cxx b/tmva/src/DataSetFactory.cxx index 68cdc6f5f8f56a137ba69132f07b011e6ca370e6..2dfdaf7844ef0ef72003c776db0a4a35b0a296e6 100644 --- a/tmva/src/DataSetFactory.cxx +++ b/tmva/src/DataSetFactory.cxx @@ -679,7 +679,7 @@ TMVA::DataSetFactory::BuildEventVector( TMVA::DataSetInfo& dsi, eventCounts[i].varAvLength[ivar] = 0; } - Bool_t haveArrayVariable = kFALSE; + // Bool_t haveArrayVariable = kFALSE; Bool_t *varIsArray = new Bool_t[nvars]; // if we work with chains we need to remember the current tree if @@ -741,7 +741,7 @@ TMVA::DataSetFactory::BuildEventVector( TMVA::DataSetInfo& dsi, Int_t ndata = fInputFormulas[ivar]->GetNdata(); classEventCounts.varAvLength[ivar] += ndata; if (ndata == 1) continue; - haveArrayVariable = kTRUE; + // haveArrayVariable = kTRUE; varIsArray[ivar] = kTRUE; if (sizeOfArrays == 1) { sizeOfArrays = ndata; diff --git a/tmva/src/DecisionTree.cxx b/tmva/src/DecisionTree.cxx index b24eb4b80c421a3bd61c6a20398aac6c68939f61..8dd0f64b09ab69fc860c11e2af85d326d13dce63 100644 --- a/tmva/src/DecisionTree.cxx +++ b/tmva/src/DecisionTree.cxx @@ -270,9 +270,9 @@ UInt_t TMVA::DecisionTree::BuildTree( const vector<TMVA::Event*> & eventSample, // building the decision tree by recursively calling the splitting of // one (root-) node into two daughter nodes (returns the number of nodes) - Bool_t IsRootNode=kFALSE; + // Bool_t IsRootNode=kFALSE; if (node==NULL) { - IsRootNode = kTRUE; + // IsRootNode = kTRUE; //start with the root node node = new TMVA::DecisionTreeNode(); fNNodes = 1; diff --git a/tmva/src/MethodCFMlpANN_Utils.cxx b/tmva/src/MethodCFMlpANN_Utils.cxx index d8f522c315328f55ecf24e26d5a6e7c754504806..6056f251d56d34a41aa6385397cd437c55b21f2d 100644 --- a/tmva/src/MethodCFMlpANN_Utils.cxx +++ b/tmva/src/MethodCFMlpANN_Utils.cxx @@ -172,16 +172,16 @@ void TMVA::MethodCFMlpANN_Utils::Train_nn( Double_t *tin2, Double_t *tout2, Int_ fVarn2_1.Create( *ntrain + *ntest, *nvar2 ); fVarn3_1.Create( *ntrain + *ntest, *nvar2 ); - Int_t imax; + // Int_t imax; char det[20]; Entree_new(nvar2, det, ntrain, ntest, nlayer, nodes, ncycle, (Int_t)20); if (fNeur_1.neuron[fParam_1.layerm - 1] == 1) { - imax = 2; + // imax = 2; fParam_1.lclass = 2; } else { - imax = fNeur_1.neuron[fParam_1.layerm - 1] << 1; + // imax = fNeur_1.neuron[fParam_1.layerm - 1] << 1; fParam_1.lclass = fNeur_1.neuron[fParam_1.layerm - 1]; } fParam_1.nvar = fNeur_1.neuron[0]; @@ -760,9 +760,9 @@ void TMVA::MethodCFMlpANN_Utils::Cout( Int_t * /*i1*/, Double_t *xxx ) void TMVA::MethodCFMlpANN_Utils::Inl() { // [smart comments to be added] - Int_t i__1, i__2, i__3; + Int_t i__1, i__2; - Int_t jmin, jmax, k, layer, kk, nq, nr; + Int_t jmax, k, layer, kk, nq, nr; i__1 = fParam_1.nvar; i__1 = fParam_1.layerm; @@ -778,12 +778,12 @@ void TMVA::MethodCFMlpANN_Utils::Inl() } i__2 = kk; for (k = 1; k <= i__2; ++k) { - jmin = k * 10 - 9; + // jmin = k * 10 - 9; jmax = k * 10; if (fNeur_1.neuron[layer] < jmax) { jmax = fNeur_1.neuron[layer]; } - i__3 = fNeur_1.neuron[layer - 1]; + // i__3 = fNeur_1.neuron[layer - 1]; } } } @@ -814,17 +814,17 @@ void TMVA::MethodCFMlpANN_Utils::GraphNN( Int_t *ilearn, Double_t * /*xxx*/, Int_t i__1, i__2; Double_t xmok[max_nNodes_]; - Float_t xpaw; + // Float_t xpaw; Double_t xmko[max_nNodes_]; Int_t i__, j; Int_t ix; - Int_t jjj; - Float_t vbn[10]; + // Int_t jjj; + // Float_t vbn[10]; Int_t nko[max_nNodes_], nok[max_nNodes_]; - for (i__ = 1; i__ <= 10; ++i__) { - vbn[i__ - 1] = (Float_t)0.; - } + // for (i__ = 1; i__ <= 10; ++i__) { + // vbn[i__ - 1] = (Float_t)0.; + // } if (*ilearn == 1) { // AH: removed output } @@ -840,7 +840,7 @@ void TMVA::MethodCFMlpANN_Utils::GraphNN( Int_t *ilearn, Double_t * /*xxx*/, En_avant(&i__); i__2 = fNeur_1.neuron[fParam_1.layerm - 1]; for (j = 1; j <= i__2; ++j) { - xpaw = (Float_t) y_ref(fParam_1.layerm, j); + // xpaw = (Float_t) y_ref(fParam_1.layerm, j); if (fVarn_1.nclass[i__ - 1] == j) { ++nok[j - 1]; xmok[j - 1] += y_ref(fParam_1.layerm, j); @@ -848,13 +848,13 @@ void TMVA::MethodCFMlpANN_Utils::GraphNN( Int_t *ilearn, Double_t * /*xxx*/, else { ++nko[j - 1]; xmko[j - 1] += y_ref(fParam_1.layerm, j); - jjj = j + fNeur_1.neuron[fParam_1.layerm - 1]; - } - if (j <= 9) { - vbn[j - 1] = xpaw; + // jjj = j + fNeur_1.neuron[fParam_1.layerm - 1]; } + // if (j <= 9) { + // vbn[j - 1] = xpaw; + // } } - vbn[9] = (Float_t) fVarn_1.nclass[i__ - 1]; + // vbn[9] = (Float_t) fVarn_1.nclass[i__ - 1]; } i__1 = fNeur_1.neuron[fParam_1.layerm - 1]; for (j = 1; j <= i__1; ++j) { @@ -962,7 +962,9 @@ void TMVA::MethodCFMlpANN_Utils::Lecev2( Int_t *ktest, Double_t *tout2, Double_t // [smart comments to be added] Int_t i__1, i__2; - Int_t i__, j, k, l, mocla[max_nNodes_], ikend; + Int_t i__, j, l; + // Int_t mocla[max_nNodes_]; + Int_t ikend; Double_t xpg[max_nVar_]; /* NTRAIN: Nb of events used during the learning */ @@ -972,9 +974,9 @@ void TMVA::MethodCFMlpANN_Utils::Lecev2( Int_t *ktest, Double_t *tout2, Double_t *ktest = 0; i__1 = fParam_1.lclass; - for (k = 1; k <= i__1; ++k) { - mocla[k - 1] = 0; - } + // for (k = 1; k <= i__1; ++k) { + // mocla[k - 1] = 0; + // } i__1 = fParam_1.nevt; for (i__ = 1; i__ <= i__1; ++i__) { DataInterface(tout2, tin2, &fg_999, &fg_0, &fParam_1.nevt, &fParam_1.nvar, @@ -1061,23 +1063,23 @@ void TMVA::MethodCFMlpANN_Utils::Arret( const char* mot ) std::exit(1); } -void TMVA::MethodCFMlpANN_Utils::CollectVar( Int_t *nvar, Int_t *class__, Double_t *xpg ) +void TMVA::MethodCFMlpANN_Utils::CollectVar( Int_t * /*nvar*/, Int_t * /*class__*/, Double_t * /*xpg*/ ) { - // [smart comments to be added] - Int_t i__1; + // // [smart comments to be added] + // Int_t i__1; - Int_t i__; - Float_t x[201]; - - // Parameter adjustments - --xpg; - - for (i__ = 1; i__ <= 201; ++i__) { - x[i__ - 1] = 0.0; - } - x[0] = (Float_t) (*class__); - i__1 = *nvar; - for (i__ = 1; i__ <= i__1; ++i__) { - x[i__] = (Float_t) xpg[i__]; - } + // Int_t i__; + // Float_t x[201]; + + // // Parameter adjustments + // --xpg; + + // for (i__ = 1; i__ <= 201; ++i__) { + // x[i__ - 1] = 0.0; + // } + // x[0] = (Float_t) (*class__); + // i__1 = *nvar; + // for (i__ = 1; i__ <= i__1; ++i__) { + // x[i__] = (Float_t) xpg[i__]; + // } } diff --git a/tmva/src/MethodCompositeBase.cxx b/tmva/src/MethodCompositeBase.cxx index 313edc22c791fa24e8793d31a438237b5a8ad396..e851631e76faf8e405a3bc7be220ee00d4d502f4 100644 --- a/tmva/src/MethodCompositeBase.cxx +++ b/tmva/src/MethodCompositeBase.cxx @@ -160,13 +160,13 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode ) gTools().ReadAttr( ch, "JobName", jobName ); gTools().ReadAttr( ch, "Options", optionString ); - Bool_t rerouteTransformation = kFALSE; + // Bool_t rerouteTransformation = kFALSE; if (gTools().HasAttr( ch, "UseMainMethodTransformation")) { TString rerouteString(""); gTools().ReadAttr( ch, "UseMainMethodTransformation", rerouteString ); rerouteString.ToLower(); - if (rerouteString=="true") - rerouteTransformation=kTRUE; + // if (rerouteString=="true") + // rerouteTransformation=kTRUE; } //remove trailing "~" to signal that options have to be reused diff --git a/tmva/src/MethodDT.cxx b/tmva/src/MethodDT.cxx index f09e790457e56feeaafa81ed18915436303f8009..133dd66204f6b7fb96fe982e2fe7f49ab4e33b0c 100644 --- a/tmva/src/MethodDT.cxx +++ b/tmva/src/MethodDT.cxx @@ -391,7 +391,7 @@ Bool_t TMVA::MethodDT::MonitorBoost( MethodBoost* booster ) //_______________________________________________________________________ -Double_t TMVA::MethodDT::PruneTree(const Int_t methodIndex) +Double_t TMVA::MethodDT::PruneTree(const Int_t /* methodIndex */ ) { if (fAutomatic && fPruneMethod == DecisionTree::kCostComplexityPruning) { // automatic cost complexity pruning CCPruner* pruneTool = new CCPruner(fTree, this->Data() , fSepType); @@ -403,9 +403,8 @@ Double_t TMVA::MethodDT::PruneTree(const Int_t methodIndex) delete pruneTool; } else if (fAutomatic && fPruneMethod != DecisionTree::kCostComplexityPruning){ - Int_t bla; - bla = methodIndex; //make the compiler quiet /* + Double_t alpha = 0; Double_t delta = fDeltaPruneStrength; diff --git a/tmva/src/MethodKNN.cxx b/tmva/src/MethodKNN.cxx index 12b3b25a8581177dcd219624a7e240824bb3200e..501e1bc4e3878fb7aad65cf28b42296af1d95f82 100644 --- a/tmva/src/MethodKNN.cxx +++ b/tmva/src/MethodKNN.cxx @@ -603,7 +603,8 @@ void TMVA::MethodKNN::ReadWeightsFromStream(istream& is) Log() << kFATAL << "Missing comma delimeter(s)" << Endl; } - Int_t ievent = -1, type = -1; + // Int_t ievent = -1; + Int_t type = -1; Double_t weight = -1.0; kNN::VarVec vvec(nvar, 0.0); @@ -630,7 +631,7 @@ void TMVA::MethodKNN::ReadWeightsFromStream(istream& is) } if (vcount == 0) { - ievent = std::atoi(vstring.c_str()); + // ievent = std::atoi(vstring.c_str()); } else if (vcount == 1) { type = std::atoi(vstring.c_str()); diff --git a/tmva/src/MethodSVM.cxx b/tmva/src/MethodSVM.cxx index 82ea1040cfe952f2d0ac456f0358bbafb73e0522..65f28305f173c9a0ebfd8b2b90a482fcf316cc9a 100644 --- a/tmva/src/MethodSVM.cxx +++ b/tmva/src/MethodSVM.cxx @@ -264,7 +264,7 @@ void TMVA::MethodSVM::ReadWeightsFromXML( void* wghtnode ) Float_t alpha_p = 0.; Int_t typeFlag=-1; - UInt_t ns = 0; + // UInt_t ns = 0; std::vector<Float_t>* svector = new std::vector<Float_t>(GetNvar()); if (fMaxVars!=0) delete fMaxVars; @@ -281,7 +281,7 @@ void TMVA::MethodSVM::ReadWeightsFromXML( void* wghtnode ) for (UInt_t ievt = 0; ievt < fNsupv; ievt++) { TVectorD temp(GetNvar()+4); gTools().ReadTVectorDFromXML(supportvectornode,"SupportVector",&temp); - ns=(UInt_t)temp[0]; + // ns=(UInt_t)temp[0]; typeFlag=(int)temp[1]; alpha=temp[2]; alpha_p=temp[3]; diff --git a/tmva/src/PDEFoam.cxx b/tmva/src/PDEFoam.cxx index c9dc46c2ff1e06fb5bd121c75b372f5ae8cb3fa0..fdb6d02b26133a295d0d5551198179124fd53151 100644 --- a/tmva/src/PDEFoam.cxx +++ b/tmva/src/PDEFoam.cxx @@ -555,11 +555,11 @@ void TMVA::PDEFoam::Varedu(Double_t ceSum[5], Int_t &kBest, Double_t &xBest, Dou // using results of the MC exploration run stored in fHistEdg Double_t nent = ceSum[2]; - Double_t swAll = ceSum[0]; + // Double_t swAll = ceSum[0]; Double_t sswAll = ceSum[1]; Double_t ssw = sqrt(sswAll)/sqrt(nent); // - Double_t swIn,swOut,sswIn,sswOut,xLo,xUp; + Double_t sswIn,sswOut,xLo,xUp; kBest =-1; xBest =0.5; yBest =1.0; @@ -568,7 +568,7 @@ void TMVA::PDEFoam::Varedu(Double_t ceSum[5], Int_t &kBest, Double_t &xBest, Dou for(Int_t kProj=0; kProj<fDim; kProj++) { if( fMaskDiv[kProj]) { // initialize search over bins - Double_t sigmIn =0.0; Double_t sigmOut =0.0; + // Double_t sigmIn =0.0; Double_t sigmOut =0.0; Double_t sswtBest = gHigh; Double_t gain =0.0; Double_t xMin=0.0; Double_t xMax=0.0; @@ -580,15 +580,15 @@ void TMVA::PDEFoam::Varedu(Double_t ceSum[5], Int_t &kBest, Double_t &xBest, Dou asswIn += Sqr(((TH1D *)(*fHistEdg)[kProj])->GetBinError( jUp)); xLo=(jLo-1.0)/fNBin; xUp=(jUp*1.0)/fNBin; - swIn = aswIn/nent; - swOut = (swAll-aswIn)/nent; + // swIn = aswIn/nent; + // swOut = (swAll-aswIn)/nent; sswIn = sqrt(asswIn) /sqrt(nent*(xUp-xLo)) *(xUp-xLo); sswOut= sqrt(sswAll-asswIn)/sqrt(nent*(1.0-xUp+xLo)) *(1.0-xUp+xLo); if( (sswIn+sswOut) < sswtBest) { sswtBest = sswIn+sswOut; gain = ssw-sswtBest; - sigmIn = sswIn -swIn; // Debug - sigmOut = sswOut-swOut; // Debug + // sigmIn = sswIn -swIn; // Debug + // sigmOut = sswOut-swOut; // Debug xMin = xLo; xMax = xUp; } @@ -690,7 +690,7 @@ Int_t TMVA::PDEFoam::Divide(PDEFoamCell *cell) // and their properties set with help of MC sampling (PDEFoam_Explore) // Returns Code RC=-1 of buffer limit is reached, fLastCe=fnBuf. - Double_t xdiv; + // Double_t xdiv; Int_t kBest; if(fLastCe+1 >= fNCells) Log() << kFATAL << "Buffer limit is reached, fLastCe=fnBuf" << Endl; @@ -698,7 +698,7 @@ Int_t TMVA::PDEFoam::Divide(PDEFoamCell *cell) cell->SetStat(0); // reset cell as inactive fNoAct++; - xdiv = cell->GetXdiv(); + // xdiv = cell->GetXdiv(); kBest = cell->GetBest(); if( kBest<0 || kBest>=fDim ) Log() << kFATAL << "Wrong kBest" << Endl; diff --git a/tmva/src/RuleEnsemble.cxx b/tmva/src/RuleEnsemble.cxx index 321d7dc8a1456a31dbb1f3f2ce9d58e369844404..a64f2c77d0ce99b626ab7e70a8c9ca6b7434e059 100644 --- a/tmva/src/RuleEnsemble.cxx +++ b/tmva/src/RuleEnsemble.cxx @@ -549,10 +549,10 @@ void TMVA::RuleEnsemble::MakeRules( const std::vector< const DecisionTree *> & f Double_t sumnendn=0; Double_t sumn2=0; // - UInt_t prevs; + // UInt_t prevs; UInt_t ntrees = forest.size(); for ( UInt_t ind=0; ind<ntrees; ind++ ) { - prevs = fRules.size(); + // prevs = fRules.size(); MakeRulesFromTree( forest[ind] ); nrules = CalcNRules( forest[ind] ); nendn = (nrules/2) + 1; @@ -804,7 +804,7 @@ void TMVA::RuleEnsemble::RuleResponseStats() Bool_t sigRule; Bool_t sigTag; Bool_t bkgTag; - Bool_t noTag; + // Bool_t noTag; Bool_t sigTrue; Bool_t tagged; // Counters @@ -850,7 +850,7 @@ void TMVA::RuleEnsemble::RuleResponseStats() tagged = fRules[i]->EvalEvent(*eveData); sigTag = (tagged && sigRule); // it's tagged as a signal bkgTag = (tagged && (!sigRule)); // ... as bkg - noTag = !(sigTag || bkgTag); // ... not tagged + // noTag = !(sigTag || bkgTag); // ... not tagged sigTrue = (eveData->GetClass() == 0); // true if event is true signal if (tagged) { ntag++; diff --git a/tmva/src/RuleFit.cxx b/tmva/src/RuleFit.cxx index 518ae0b10caec317cab060ab4ced7389b88f5430..ccde85bb8b8587619d6c1537d6e0b02a9cf21322 100644 --- a/tmva/src/RuleFit.cxx +++ b/tmva/src/RuleFit.cxx @@ -192,7 +192,7 @@ void TMVA::RuleFit::MakeForest() // Timer timer( fMethodRuleFit->GetNTrees(), "RuleFit" ); - Double_t fsig; + // Double_t fsig; Int_t nsig,nbkg; // TRandom3 rndGen; @@ -216,7 +216,7 @@ void TMVA::RuleFit::MakeForest() if (fMethodBase->DataInfo().IsSignal(fTrainingEventsRndm[ie])) nsig++; // ignore weights here else nbkg++; } - fsig = Double_t(nsig)/Double_t(nsig+nbkg); + // fsig = Double_t(nsig)/Double_t(nsig+nbkg); // do not implement the above in this release...just set it to default // nminRnd = fNodeMinEvents; DecisionTree *dt; diff --git a/tmva/src/RuleFitParams.cxx b/tmva/src/RuleFitParams.cxx index 9063053a25bc91352abad01f82db49c74eb9eb9f..a702eb32e66be6ebbc0a60ce3d495fadc1196120 100644 --- a/tmva/src/RuleFitParams.cxx +++ b/tmva/src/RuleFitParams.cxx @@ -237,8 +237,8 @@ void TMVA::RuleFitParams::EvaluateAverage( UInt_t ind1, UInt_t ind2, ew = fRuleFit->GetTrainingEventWeight(i); sumew += ew; // first cache rule/lin response - Double_t val = fRuleEnsemble->EvalLinEvent(*((*events)[i])); - val = fRuleEnsemble->EvalEvent(*((*events)[i])); + /* Double_t val = */ fRuleEnsemble->EvalLinEvent(*((*events)[i])); + /* val = */ fRuleEnsemble->EvalEvent(*((*events)[i])); // loop over linear terms for ( UInt_t sel=0; sel<fNLinear; sel++ ) { avsel[sel] += ew*fRuleEnsemble->GetEventLinearValNorm(sel); @@ -551,7 +551,7 @@ void TMVA::RuleFitParams::MakeGDPath() // parameters set at point with min error Double_t errmin=1e32; // min error - Double_t riskMin=0; // risk + // Double_t riskMin=0; // risk Int_t indMin=-1; // index std::vector<Double_t> coefsMin; // rule coefs std::vector<Double_t> lincoefsMin; // linear coefs @@ -699,7 +699,7 @@ void TMVA::RuleFitParams::MakeGDPath() // if (fNTErrorRate<=errmin) { errmin = fNTErrorRate; - riskMin = fNTRisk; + // riskMin = fNTRisk; indMin = iloop; fRuleEnsemble->GetCoefficients(coefsMin); lincoefsMin = fRuleEnsemble->GetLinCoefficients(); @@ -755,7 +755,7 @@ void TMVA::RuleFitParams::MakeGDPath() if (indMin<0) { Log() << kWARNING << "BUG TRAP: should not be here - still, this bug is harmless;)" << Endl; errmin = fNTErrorRate; - riskMin = fNTRisk; + // riskMin = fNTRisk; indMin = iloop; fRuleEnsemble->GetCoefficients(coefsMin); lincoefsMin = fRuleEnsemble->GetLinCoefficients(); @@ -1047,7 +1047,7 @@ Double_t TMVA::RuleFitParams::ErrorRateRocRaw( std::vector<Double_t> & sFsig, Double_t effs=1.0; Double_t prejb=0; Double_t peffs=1.0; - Double_t drejb; + // Double_t drejb; Double_t deffs; Double_t area=0; Int_t npok=0; @@ -1065,7 +1065,7 @@ Double_t TMVA::RuleFitParams::ErrorRateRocRaw( std::vector<Double_t> & sFsig, rejb = Double_t(nrbkg)/Double_t(nbkg); effs = Double_t(nesig)/Double_t(nsig); // - drejb = rejb-prejb; + // drejb = rejb-prejb; deffs = effs-peffs; area += 0.5*TMath::Abs(deffs)*(rejb+prejb); // trapezoid prejb = rejb; diff --git a/tmva/src/Tools.cxx b/tmva/src/Tools.cxx index 2b80bc8befd047d48663fb7fadb9e885a668f0ca..230ac6ce663438d1c07c27ff6e825dc837354cf9 100644 --- a/tmva/src/Tools.cxx +++ b/tmva/src/Tools.cxx @@ -1454,10 +1454,10 @@ TMVA::Tools::CalcCovarianceMatrices( const std::vector<Event*>& events, Int_t ma std::vector<Float_t> input; std::vector<Char_t> mask; // entries with kTRUE must not be transformed - Bool_t hasMaskedEntries = kFALSE; - if (transformBase) - hasMaskedEntries = transformBase->GetInput (ev, input, mask); - else { + // Bool_t hasMaskedEntries = kFALSE; + if (transformBase) { + /* hasMaskedEntries = */ transformBase->GetInput (ev, input, mask); + } else { for (ivar=0; ivar<nvars; ++ivar) { input.push_back (ev->GetValue(ivar)); } diff --git a/tmva/src/VariableGaussTransform.cxx b/tmva/src/VariableGaussTransform.cxx index c8778d0e4726dc78ca4a002961f2a9bf56cfbea2..3640172d3075f9d53b74b52917be3f84f834effd 100644 --- a/tmva/src/VariableGaussTransform.cxx +++ b/tmva/src/VariableGaussTransform.cxx @@ -718,9 +718,9 @@ void TMVA::VariableGaussTransform::MakeFunction( std::ostream& fout, const TStri Double_t xmn=(fCumulativePDF[ivar][icls])->GetXmin(); Double_t xmx=(fCumulativePDF[ivar][icls])->GetXmax(); - Int_t idx = 0; + // Int_t idx = 0; try{ - idx = fGet.at(ivar).second; + // idx = fGet.at(ivar).second; Char_t type = fGet.at(ivar).first; if( type != 'v' ){ Log() << kWARNING << "MakeClass for the Gauss transformation works only for the transformation of variables. The transformation of targets/spectators is not implemented." << Endl; diff --git a/tmva/src/VariableRearrangeTransform.cxx b/tmva/src/VariableRearrangeTransform.cxx index 60f51ba86c2925e86dd9369f8e5cc6308feefd4f..a183470b6caa98fb6f624b95cb11509038a528dd 100644 --- a/tmva/src/VariableRearrangeTransform.cxx +++ b/tmva/src/VariableRearrangeTransform.cxx @@ -137,14 +137,11 @@ void TMVA::VariableRearrangeTransform::ReadFromXML( void* trfnode ) // // Read the transformation matrices from the xml node - Bool_t newFormat = kFALSE; - void* inpnode = NULL; inpnode = gTools().GetChild(trfnode, "Selection"); // new xml format if(inpnode == NULL) Log() << kFATAL << "Unknown weight file format for transformations. (tried to read in 'rearrange' transform)" << Endl; - newFormat = kTRUE; VariableTransformBase::ReadFromXML( inpnode ); diff --git a/tmva/src/VariableTransformBase.cxx b/tmva/src/VariableTransformBase.cxx index 38e068c183eddbe0f0cfbc6a01bcc0d174416073..be744bad16499b8e1d2995614b7fb165fe6d0d85 100644 --- a/tmva/src/VariableTransformBase.cxx +++ b/tmva/src/VariableTransformBase.cxx @@ -251,7 +251,7 @@ void TMVA::VariableTransformBase::SelectInput( const TString& _inputVariables, B ItVarTypeIdx itGet = fGet.begin(), itGetEnd = fGet.end(); - ItVarTypeIdx itPut = fPut.begin(), itPutEnd = fPut.end(); + ItVarTypeIdx itPut = fPut.begin(); // , itPutEnd = fPut.end(); for( ; itGet != itGetEnd; ++itGet ) { TString inputTypeString = "?"; diff --git a/tree/tree/src/TTreeCacheUnzip.cxx b/tree/tree/src/TTreeCacheUnzip.cxx index 7d22e3ccf9480ba6e52a76461d0cd143f7c5346e..04048d0091a2ce11194d39cc6511fb77db5ed18b 100644 --- a/tree/tree/src/TTreeCacheUnzip.cxx +++ b/tree/tree/src/TTreeCacheUnzip.cxx @@ -223,7 +223,6 @@ Bool_t TTreeCacheUnzip::FillBuffer() TTree *tree = ((TBranch*)fBranches->UncheckedAt(0))->GetTree(); Long64_t entry = tree->GetReadEntry(); - Long64_t fEntryCurrentMax = 0; // If the entry is in the range we previously prefetched, there is // no point in retrying. Note that this will also return false @@ -234,7 +233,6 @@ Bool_t TTreeCacheUnzip::FillBuffer() // Triggered by the user, not the learning phase if (entry == -1) entry=0; - fEntryCurrentMax = fEntryCurrent; TTree::TClusterIterator clusterIter = tree->GetClusterIterator(entry); fEntryCurrent = clusterIter(); fEntryNext = clusterIter.GetNextEntry();