Changeset 18957 for trunk

Timestamp:

03/25/18 16:32:05 (7 years ago)

Author:

tbretz

Message:

Improved compiler warnings.

Location:

trunk/Mars

Files:

• CMakeLists.txt (modified) (6 diffs)
• manalysis/MSoftwareTriggerCalc.cc (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mfileio/MWriteFitsFile.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (1 diff)
• mjobs/MJMerpp.cc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (3 diffs)
• mjobs/MSequence.cc (modified) (2 diffs)
• mjtrain/MJTrainCuts.cc (modified) (2 diffs)
• msimcamera/MSimCamera.cc (modified) (1 diff)
• msimreflector/MSimReflector.cc (modified) (1 diff)
• mtools/MRolke.cc (modified) (3 diffs)
• mtools/MagicReversi.cc (modified) (1 diff)
• mtools/MineSweeper.cc (modified) (1 diff)

trunk/Mars/CMakeLists.txt

@@ -62 +62 @@
 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 +116 @@
 # -------------------------------------------------------
 
+FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/dictionary)
+
 MACRO(SRCFILES subdir)
 
@@ -136 +138 @@
         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 +194 @@
 INCLUDE_DIRECTORIES(${ROOT_INCLUDE_DIRS} ${DIRECTORIES} mcore .)
 
-ROOT_GENERATE_DICTIONARY(G__MARS
+ROOT_GENERATE_DICTIONARY(dictionary/MARS
            factofits.h
            factfits.h
@@ -204 +206 @@
         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 +217 @@
 
 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

trunk/Mars/manalysis/MSoftwareTriggerCalc.cc

@@ -93 +93 @@
 Int_t MSoftwareTriggerCalc::Process()
 {
-    const UShort_t *idx = fRawEvt->GetPixelIds();
+    const UShort_t *ids = fRawEvt->GetPixelIds();
 
     const int beg =  10;
@@ -118 +118 @@
             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;

trunk/Mars/mbase/MStatusDisplay.cc

@@ -2396 +2396 @@
 
             // 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);

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -548 +548 @@
          // 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);

trunk/Mars/mhflux/MHAlpha.cc

@@ -583 +583 @@
                 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);

trunk/Mars/mjobs/MJMerpp.cc

@@ -389 +389 @@
         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;

trunk/Mars/mjobs/MJSimulation.cc

@@ -1108 +1108 @@
                 gPad->SetGridy();
                 gROOT->SetSelectedPad(0);
-                MHCamera *c = new MHCamera(static_cast<MGeomCam&>(*env1.GetCont()));
-                c->SetStats(kFALSE);
-                c->SetBit(MHCamera::kNoLegend);
-                c->SetBit(kCanDelete);
-                c->Draw();
+                MHCamera *hcam = new MHCamera(static_cast<MGeomCam&>(*env1.GetCont()));
+                hcam->SetStats(kFALSE);
+                hcam->SetBit(MHCamera::kNoLegend);
+                hcam->SetBit(kCanDelete);
+                hcam->Draw();
             }
 
@@ -1123 +1123 @@
                 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 +1173 @@
         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());
     }
 

trunk/Mars/mjobs/MSequence.cc

@@ -321 +321 @@
     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 +328 @@
         }
 
-        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 (n2<n1)
+            const Int_t m1 = atoi(fnum.Data());
+            const Int_t m2 = atoi(fnum.Data()+q1+1);
+
+            if (m2<m1)
             {
-                *fLog << warn << "WARNING - Invalid range in '" << num << "'... ignored." << endl;
+                *fLog << warn << "WARNING - Invalid range in '" << fnum << "'... ignored." << endl;
                 return;
             }
 
             // FIXME: n2==0 || n2<n1
-            for (int i=n1; i<=n2; i++)
+            for (int i=m1; i<=m2; i++)
                 AddEntry(run, i, data, sub);
         }
         else
         {
-            const Int_t file = atoi(num.Data());
+            const Int_t file = atoi(fnum.Data());
             AddEntry(run, file, data, sub);
         }
 
-        files.Remove(0, files.First(num)+num.Length());
+        files.Remove(0, files.First(fnum)+fnum.Length());
     }
 }

trunk/Mars/mjtrain/MJTrainCuts.cc

@@ -941 +941 @@
             return kFALSE;
 
-        MHn    *hist = hs->GetHistN(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 +982 @@
     while ((o=NextF()))
     {
-        MFillH *fill = dynamic_cast<MFillH*>(o);
-        if (fill)
-            fill->ResetBit(MFillH::kDoNotDisplay);
+        MFillH *fillh = dynamic_cast<MFillH*>(o);
+        if (fillh)
+            fillh->ResetBit(MFillH::kDoNotDisplay);
     }
 

trunk/Mars/msimcamera/MSimCamera.cc

@@ -155 +155 @@
     }
     // Check all entries for inf and nan. Those are not accepted here.
-    for( int row_index=0; row_index<fFixTimeOffsetsBetweenPixelsInNs->fM.size(); row_index++){
-        std::vector<double> row = fFixTimeOffsetsBetweenPixelsInNs->fM.at(row_index);
-        for( int col_index=0; col_index<row.size(); col_index++){
-            double specific_delay = row.at(col_index);
-            if( std::isnan(specific_delay) || std::isinf(specific_delay) ){
+    for(size_t row_index=0; row_index<fFixTimeOffsetsBetweenPixelsInNs->fM.size(); row_index++){
+        const vector<double> row = fFixTimeOffsetsBetweenPixelsInNs->fM.at(row_index);
+        for(size_t col_index=0; col_index<row.size(); col_index++){
+            const double specific_delay = row.at(col_index);
+            if( isnan(specific_delay) || isinf(specific_delay) ){
                 *fLog << err << "In Source: "<< __FILE__ <<" in line: ";
                 *fLog << __LINE__;

trunk/Mars/msimreflector/MSimReflector.cc

@@ -472 +472 @@
     UInt_t cnt[6] = { 0, 0, 0, 0, 0, 0 };
 
-    const Int_t num = arr.GetEntriesFast();
-    for (Int_t idx=0; idx<num; idx++)
+    const Int_t nentries = arr.GetEntriesFast();
+    for (Int_t idx=0; idx<nentries; idx++)
     {
         MPhotonData *dat = static_cast<MPhotonData*>(arr.UncheckedAt(idx));

trunk/Mars/mtools/MRolke.cc

@@ -171 +171 @@
    Double_t med = 0;
    Double_t maxiter=1000, acc = 0.00001;
-   Int_t i;
    Int_t bp = 0;
 
@@ -314 +313 @@
    }
 
-   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 +387 @@
       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);
    }
 

trunk/Mars/mtools/MagicReversi.cc

@@ -245 +245 @@
         // 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))

trunk/Mars/mtools/MineSweeper.cc

@@ -223 +223 @@
         // 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))