Fix coverity issues
authorcholm <cholm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 9 Feb 2011 13:24:47 +0000 (13:24 +0000)
committercholm <cholm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 9 Feb 2011 13:24:47 +0000 (13:24 +0000)
FMD/AliFMDCalibGain.cxx
FMD/AliFMDCalibPedestal.cxx
FMD/AliFMDPattern.cxx
FMD/AliFMDQAChecker.cxx
FMD/CMakelibFMDbase.pkg

index 064e9a8..42f14a5 100644 (file)
@@ -97,7 +97,8 @@ namespace {
       : fDead(dead), fMin(min), fMax(max), fCount(0)
     {}
     MakeDead(const MakeDead& other) 
-      : fDead(other.fDead), fMin(other.fMin), fMax(other.fMax), 
+      : AliFMDMap::ForOne(other),
+        fDead(other.fDead), fMin(other.fMin), fMax(other.fMax), 
        fCount(other.fCount)
     {}
     MakeDead& operator=(const MakeDead& other) 
index 8bcdccc..5b2eade 100644 (file)
@@ -106,7 +106,8 @@ namespace {
       : fDead(dead), fMax(max), fCount(0)
     {}
     MakeDead(const MakeDead& other) 
-      : fDead(other.fDead), fMax(other.fMax), fCount(other.fCount)
+      : AliFMDMap::ForOne(other),
+        fDead(other.fDead), fMax(other.fMax), fCount(other.fCount)
     {}
     MakeDead& operator=(const MakeDead& other) 
     { 
index 9e759db..af26685 100644 (file)
@@ -291,7 +291,8 @@ AliFMDPattern::AliFMDPattern(const char* gAliceFile)
     fTotal(.2, .35, "Total:   "), 
     fFMD1Area(0),
     fFMD2Area(0),
-    fFMD3Area(0)
+    fFMD3Area(0),
+    fPhysicsSelection(0)
 {
   // Constructor. 
   // 
index 6db9198..7b1eb07 100644 (file)
@@ -165,7 +165,7 @@ AliFMDQAChecker::MakeImage(TObjArray** list,
                                AliQAv1::GetImageFileFormat()), "ps") ; 
     fImage[specie]->Clear(); 
 
-    Int_t nx = (nImages + .5) / 2;
+    Int_t nx = int(nImages + .5) / 2;
     Int_t ny = 2;
     fImage[specie]->Divide(nx, ny, 0, 0);
     
index e5e831f..be9f39f 100644 (file)
@@ -1,31 +1,53 @@
-#--------------------------------------------------------------------------------#
-# Package File for FMDbase                                                       #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS   AliFMDIndex.cxx AliFMDBaseDigit.cxx AliFMDDigit.cxx AliFMDSDigit.cxx AliFMDBoolMap.cxx AliFMDUShortMap.cxx AliFMDCalibPedestal.cxx AliFMDCalibGain.cxx AliFMDCalibSampleRate.cxx AliFMDCalibStripRange.cxx AliFMDAltroMapping.cxx AliFMDParameters.cxx AliFMDGeometry.cxx AliFMDRing.cxx AliFMDDetector.cxx AliFMD1.cxx AliFMD2.cxx AliFMD3.cxx AliFMDPreprocessor.cxx AliFMDQAChecker.cxx AliFMDGeometryBuilder.cxx AliFMDSurveyToAlignObjs.cxx)
+# -*- mode: CMake -*-
+#----------------------------------------------------------------------------#
+# Package File for FMDbase                                                   #
+# Author : Johny Jose (johny.jose@cern.ch)                                   #
+# Variables Defined :                                                        #
+#                                                                            #
+# SRCS - C++ source files                                                    #
+# HDRS - C++ header files                                                    #
+# DHDR - ROOT Dictionary Linkdef header file                                 #
+# CSRCS - C source files                                                     #
+# CHDRS - C header files                                                     #
+# EINCLUDE - Include directories                                             #
+# EDEFINE - Compiler definitions                                             #
+# ELIBS - Extra libraries to link                                            #
+# ELIBSDIR - Extra library directories                                       #
+# PACKFFLAGS - Fortran compiler flags for package                            #
+# PACKCXXFLAGS - C++ compiler flags for package                              #
+# PACKCFLAGS - C compiler flags for package                                  #
+# PACKSOFLAGS - Shared library linking flags                                 #
+# PACKLDFLAGS - Module linker flags                                          #
+# PACKBLIBS - Libraries to link (Executables only)                           #
+# EXPORT - Header files to be exported                                       #
+# CINTHDRS - Dictionary header files                                         #
+# CINTAUTOLINK - Set automatic dictionary generation                         #
+# ARLIBS - Archive Libraries and objects for linking (Executables only)      #
+# SHLIBS - Shared Libraries and objects for linking (Executables only)       #
+#----------------------------------------------------------------------------#
+
+set ( SRCS   AliFMDIndex.cxx
+       AliFMDBaseDigit.cxx
+       AliFMDDigit.cxx
+       AliFMDSDigit.cxx
+       AliFMDBoolMap.cxx
+       AliFMDUShortMap.cxx
+       AliFMDCalibPedestal.cxx
+       AliFMDCalibGain.cxx
+       AliFMDCalibSampleRate.cxx
+       AliFMDCalibStripRange.cxx
+       AliFMDAltroMapping.cxx
+       AliFMDParameters.cxx
+       AliFMDGeometry.cxx
+       AliFMDRing.cxx
+       AliFMDDetector.cxx
+       AliFMD1.cxx
+       AliFMD2.cxx
+       AliFMD3.cxx
+       AliFMDPreprocessor.cxx
+       AliFMDQAChecker.cxx
+       AliFMDGeometryBuilder.cxx
+       AliFMDSurveyToAlignObjs.cxx)
 
 string (REPLACE ".cxx" ".h" HDRS  "${SRCS}")
 
@@ -35,6 +57,32 @@ set ( EINCLUDE   RAW)
 
 if( ALICE_TARGET STREQUAL "win32gcc")
        
-                               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEER -lCDB -lESD -lSTEERBase -lRAWDatabase -L${ROOTLIBDIR} -lGeom)
+  set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEER -lCDB -lESD -lSTEERBase -lRAWDatabase -L${ROOTLIBDIR} -lGeom)
 
 endif( ALICE_TARGET STREQUAL "win32gcc")
+
+# --------------------------------------------------------------------
+# Extra stuff 
+# 
+# Install OCDB data 
+install (DIRECTORY ../OCDB/FMD DESTINATION OCDB)
+
+install (DIRECTORY scripts 
+        DESTINATION FMD
+        PATTERN ".svn" EXCLUDE 
+         PATTERN ".d"   EXCLUDE 
+        PATTERN ".so"  EXCLUDE)
+
+install (FILES Config.C
+              DrawFMD.C
+              MakeFMDFullMisAlignment.C
+              MakeFMDResMisAlignment.C
+              MakeFMDZeroMisAlignment.C
+              Reconstruct.C
+              Simulate.C
+              ViewFMD.C
+        DESTINATION FMD)
+
+#
+# EOF
+#