Index: trunk/Mars/CMakeLists.txt =================================================================== --- trunk/Mars/CMakeLists.txt (revision 18956) +++ trunk/Mars/CMakeLists.txt (revision 18957) @@ -62,5 +62,5 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \ - -Wcast-align -Wformat=2 -Woverloaded-virtual \ + -Wcast-align -Wformat=1 -Woverloaded-virtual \ -Wnon-virtual-dtor -Wshadow -fPIC") # -Wextra @@ -116,4 +116,6 @@ # ------------------------------------------------------- +FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/dictionary) + MACRO(SRCFILES subdir) @@ -136,6 +138,6 @@ SEPARATE_ARGUMENTS(_HEADERS) - ROOT_GENERATE_DICTIONARY(G__${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${_CINT}LinkDef.h OPTIONS -p) - TARGET_SOURCES(mars PRIVATE G__${_CINT}.cxx ${_SRCLIST}) + ROOT_GENERATE_DICTIONARY(dictionary/${_CINT} ${_HEADERS} ${_CINT}Incl.h LINKDEF ${_CINT}LinkDef.h OPTIONS -p) + TARGET_SOURCES(mars PRIVATE dictionary/${_CINT}.cxx ${_SRCLIST}) ENDMACRO() @@ -192,5 +194,5 @@ INCLUDE_DIRECTORIES(${ROOT_INCLUDE_DIRS} ${DIRECTORIES} mcore .) -ROOT_GENERATE_DICTIONARY(G__MARS +ROOT_GENERATE_DICTIONARY(dictionary/MARS factofits.h factfits.h @@ -204,5 +206,5 @@ OPTIONS -p -D__MARS__ -DHAVE_ZLIB) -ADD_LIBRARY(mars SHARED G__MARS.cxx) +ADD_LIBRARY(mars SHARED dictionary/MARS.cxx) TARGET_LINK_LIBRARIES(mars ${ROOT_LIBRARIES}) TARGET_LINK_LIBRARIES(mars ${NOVA_LIBRARY}) @@ -215,6 +217,6 @@ ADD_CUSTOM_COMMAND(TARGET mars POST_BUILD - COMMAND ln -sf ${CMAKE_CURRENT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/ - COMMENT "Creating symlink for libmars.so to ${CMAKE_CURRENT_BINARY_DIR}") + COMMAND ln -sf ${PROJECT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/ + COMMENT "Creating symlink for libmars.so to ${PROJECT_BINARY_DIR}") #---Create a shared library with geneated dictionary Index: trunk/Mars/manalysis/MSoftwareTriggerCalc.cc =================================================================== --- trunk/Mars/manalysis/MSoftwareTriggerCalc.cc (revision 18956) +++ trunk/Mars/manalysis/MSoftwareTriggerCalc.cc (revision 18957) @@ -93,5 +93,5 @@ Int_t MSoftwareTriggerCalc::Process() { - const UShort_t *idx = fRawEvt->GetPixelIds(); + const UShort_t *ids = fRawEvt->GetPixelIds(); const int beg = 10; @@ -118,5 +118,5 @@ continue; - const Float_t *raw = fSignal->GetSamples(idx[hw]); + const Float_t *raw = fSignal->GetSamples(ids[hw]); Float_t *sum = buf.GetArray()+(hw/9)*num; Index: trunk/Mars/mbase/MStatusDisplay.cc =================================================================== --- trunk/Mars/mbase/MStatusDisplay.cc (revision 18956) +++ trunk/Mars/mbase/MStatusDisplay.cc (revision 18957) @@ -2396,7 +2396,7 @@ // Add the canvas to the list - const TString name = c->GetName(); - const TString title = c->GetTitle(); - if (title.IsNull() || name==title) + const TString _name = c->GetName(); + const TString _title = c->GetTitle(); + if (_title.IsNull() || _name==_title) c->SetTitle(gFile->GetName()); list.Add(c); Index: trunk/Mars/mfileio/MWriteFitsFile.cc =================================================================== --- trunk/Mars/mfileio/MWriteFitsFile.cc (revision 18956) +++ trunk/Mars/mfileio/MWriteFitsFile.cc (revision 18957) @@ -548,16 +548,16 @@ // create the DOL of the table. It will be something like: // fileNameNoExt_dataName.fits[dataName] - TString dol = fileNameNoExt; - dol += "_"; - dol += i_table->first; - dol += ".fits"; + TString dol2 = fileNameNoExt; + dol2 += "_"; + dol2 += i_table->first; + dol2 += ".fits"; if (fOpenOption == "RECREATE") // remove the file - unlink(dol.Data()); - - dol += "["; - dol += i_table->first; - dol += "]"; + unlink(dol2.Data()); + + dol2 += "["; + dol2 += i_table->first; + dol2 += "]"; // *fLog << err << "Reiner would have opened fits file: " << dol.Data() << endl; //exit(0); Index: trunk/Mars/mhflux/MHAlpha.cc =================================================================== --- trunk/Mars/mhflux/MHAlpha.cc (revision 18956) +++ trunk/Mars/mhflux/MHAlpha.cc (revision 18957) @@ -583,9 +583,9 @@ if (hoff) { - TH1D *dum = fOffData->ProjectionZ("dumxy", 0, fOffData->GetNbinsX()+1, 0, fOffData->GetNbinsY()+1); - dum->SetDirectory(0); + TH1D *dum2 = fOffData->ProjectionZ("dumxy", 0, fOffData->GetNbinsX()+1, 0, fOffData->GetNbinsY()+1); + dum2->SetDirectory(0); hoff->Reset(); - hoff->Add(dum); - delete dum; + hoff->Add(dum2); + delete dum2; const Double_t alpha = fFit.Scale(*hoff, *hon); Index: trunk/Mars/mjobs/MJMerpp.cc =================================================================== --- trunk/Mars/mjobs/MJMerpp.cc (revision 18956) +++ trunk/Mars/mjobs/MJMerpp.cc (revision 18957) @@ -389,9 +389,9 @@ SetPathOut(name2); - const Int_t rc = Process(); - if (rc==0) + const Int_t rc2 = Process(); + if (rc2==0) continue; - return rc; + return rc2; } return 0; Index: trunk/Mars/mjobs/MJSimulation.cc =================================================================== --- trunk/Mars/mjobs/MJSimulation.cc (revision 18956) +++ trunk/Mars/mjobs/MJSimulation.cc (revision 18957) @@ -1108,9 +1108,9 @@ gPad->SetGridy(); gROOT->SetSelectedPad(0); - MHCamera *c = new MHCamera(static_cast(*env1.GetCont())); - c->SetStats(kFALSE); - c->SetBit(MHCamera::kNoLegend); - c->SetBit(kCanDelete); - c->Draw(); + MHCamera *hcam = new MHCamera(static_cast(*env1.GetCont())); + hcam->SetStats(kFALSE); + hcam->SetBit(MHCamera::kNoLegend); + hcam->SetBit(kCanDelete); + hcam->Draw(); } @@ -1123,9 +1123,9 @@ gPad->SetGridy(); gROOT->SetSelectedPad(0); - MHCamera *c = new MHCamera(*cam); - c->SetStats(kFALSE); - c->SetBit(MHCamera::kNoLegend); - c->SetBit(kCanDelete); - c->Draw(); + MHCamera *hcam = new MHCamera(*cam); + hcam->SetStats(kFALSE); + hcam->SetBit(MHCamera::kNoLegend); + hcam->SetBit(kCanDelete); + hcam->Draw(); } } @@ -1173,11 +1173,11 @@ gPad->SetGridy(); gROOT->SetSelectedPad(0); - MParSpline *all = (MParSpline*)splinepde.DrawClone(); + MParSpline *sall = (MParSpline*)splinepde.DrawClone(); //all->SetTitle("Combined acceptance"); - all->SetBit(kCanDelete); + sall->SetBit(kCanDelete); if (splinemirror.GetSpline()) - all->Multiply(*splinemirror.GetSpline()); + sall->Multiply(*splinemirror.GetSpline()); if (splinecones2.GetSpline()) - all->Multiply(*splinecones2.GetSpline()); + sall->Multiply(*splinecones2.GetSpline()); } Index: trunk/Mars/mjobs/MSequence.cc =================================================================== --- trunk/Mars/mjobs/MSequence.cc (revision 18956) +++ trunk/Mars/mjobs/MSequence.cc (revision 18957) @@ -321,6 +321,6 @@ while (!files.IsNull()) { - const TString num = files(regexp); - if (num.IsNull()) + const TString fnum = files(regexp); + if (fnum.IsNull()) { *fLog << warn << "WARNING - File in run " << run << " is NaN (not a number): '" << files << "'" << endl; @@ -328,27 +328,27 @@ } - const Ssiz_t p1 = num.First(':'); - if (p1>=0) + const Ssiz_t q1 = fnum.First(':'); + if (q1>=0) { - const Int_t n1 = atoi(num.Data()); - const Int_t n2 = atoi(num.Data()+p1+1); - - if (n2GetHistN(fRules); - MFillH *fill = new MFillH(hist, "", Form("Fill%s", hist->GetName())); - - fill->SetWeight("MWeight"); - fill->SetDrawOption("colz"); - fill->SetNameTab(hist->GetName()); - fill->SetBit(MFillH::kDoNotDisplay); - - tlist.AddToList(fill); - - autodel.Add(fill); - autodel.Add(hist); + MHn *histn = hs->GetHistN(fRules); + MFillH *filln = new MFillH(histn, "", Form("Fill%s", histn->GetName())); + + filln->SetWeight("MWeight"); + filln->SetDrawOption("colz"); + filln->SetNameTab(histn->GetName()); + filln->SetBit(MFillH::kDoNotDisplay); + + tlist.AddToList(filln); + + autodel.Add(filln); + autodel.Add(histn); } tlist.AddToList(&fillh0); // Fill MHHadronness (not displayed in first loop) @@ -982,7 +982,7 @@ while ((o=NextF())) { - MFillH *fill = dynamic_cast(o); - if (fill) - fill->ResetBit(MFillH::kDoNotDisplay); + MFillH *fillh = dynamic_cast(o); + if (fillh) + fillh->ResetBit(MFillH::kDoNotDisplay); } Index: trunk/Mars/msimcamera/MSimCamera.cc =================================================================== --- trunk/Mars/msimcamera/MSimCamera.cc (revision 18956) +++ trunk/Mars/msimcamera/MSimCamera.cc (revision 18957) @@ -155,9 +155,9 @@ } // Check all entries for inf and nan. Those are not accepted here. - for( int row_index=0; row_indexfM.size(); row_index++){ - std::vector row = fFixTimeOffsetsBetweenPixelsInNs->fM.at(row_index); - for( int col_index=0; col_indexfM.size(); row_index++){ + const vector row = fFixTimeOffsetsBetweenPixelsInNs->fM.at(row_index); + for(size_t col_index=0; col_index(arr.UncheckedAt(idx)); Index: trunk/Mars/mtools/MRolke.cc =================================================================== --- trunk/Mars/mtools/MRolke.cc (revision 18956) +++ trunk/Mars/mtools/MRolke.cc (revision 18957) @@ -171,5 +171,4 @@ Double_t med = 0; Double_t maxiter=1000, acc = 0.00001; - Int_t i; Int_t bp = 0; @@ -314,5 +313,5 @@ } - for(i = 0; i < maxiter; i++) { + for(Int_t i = 0; i < maxiter; i++) { l = (target-fhigh)/(flow-fhigh); if (l < 0.2) l = 0.2; @@ -388,6 +387,6 @@ mu = (x-y/tau)/zm; b = y/tau; - Double_t e = zm; - f = LikeMod1(mu,b,e,x,y,z,tau,m); + Double_t ee = zm; + f = LikeMod1(mu,b,ee,x,y,z,tau,m); } Index: trunk/Mars/mtools/MagicReversi.cc =================================================================== --- trunk/Mars/mtools/MagicReversi.cc (revision 18956) +++ trunk/Mars/mtools/MagicReversi.cc (revision 18957) @@ -245,6 +245,6 @@ // Adopt absolute sized of markers to relative range // - Float_t r = (*fGeomCam)[i].GetT()*gPad->XtoAbsPixel(1)/325; - GetFlag(i)->SetMarkerSize(20.0*r/fRange); + const Float_t rr = (*fGeomCam)[i].GetT()*gPad->XtoAbsPixel(1)/325; + GetFlag(i)->SetMarkerSize(20.0*rr/fRange); if (pix.TestBit(kHasFlag)) Index: trunk/Mars/mtools/MineSweeper.cc =================================================================== --- trunk/Mars/mtools/MineSweeper.cc (revision 18956) +++ trunk/Mars/mtools/MineSweeper.cc (revision 18957) @@ -223,6 +223,6 @@ // Adopt absolute sized of markers to relative range // - Float_t r = (*fGeomCam)[i].GetT()*gPad->XtoAbsPixel(1)/325; - GetFlag(i)->SetMarkerSize(20.0*r/fRange); + const Float_t rr = (*fGeomCam)[i].GetT()*gPad->XtoAbsPixel(1)/325; + GetFlag(i)->SetMarkerSize(20.0*rr/fRange); if (pix.TestBit(kHasFlag))