'Change reinterpret_cast to a union, to comply with c++ rules. Fixes a...

'Change reinterpret_cast to a union, to comply with c++ rules.  Fixes a cppcheck warning.' (TileRecUtils-00-09-72)

2016-05-03  scott snyder  <snyder@bnl.gov>

	* Tagging TileRecUtils-00-09-72.
	* src/TileBeamInfoProvider.cxx: Change reinterpret_cast to a
	union, to comply with c++ rules.  Fixes a cppcheck warning.

2016-04-18  Siarhei Harkusha  <Siarhei.Harkusha@cern.ch>

	* Removed the executable flag from all of the files
	* src/TileRawChannelBuilderOpt2Filter.cxx: correct time in the case of without iterations
	  if actual phase for OFCs used in the calculation is different from required
	* TileRawChannelBuilderOptFilter: renamed setPedestal into getPedestal
	* TileRawChannelBuilderOpt2Filter: renamed setPedestal into getPedestal; removed some properties OfcfromCool and TileCondToolOfcCool
	* python/TileRawChannelGetter.py: adapted to removed some properties (OfcfromCool and TileCondToolOfcCool)
	  in Tile raw channel builders (Opt2 and MF kind of raw channels builders)
	* TileRawChannelBuilderMF: removed some property OfcfromCool;
	  renamed property TileCondToolOfcCool into TileCondToolOfcOnFly to make clear intention
	* TileRawChannelNoiseFilter: revert back forward declaration of TileCondToolEmscale
	* Tagging TileRecUtils-00-09-71

...
(Long ChangeLog diff - truncated)


Former-commit-id: 1e76287a

TileCalorimeter/TileRecUtils/CMakeLists.txt

+################################################################################
+# Package: TileRecUtils
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TileRecUtils )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Calorimeter/CaloConditions
+                          Calorimeter/CaloIdentifier
+                          Calorimeter/CaloInterface
+                          Calorimeter/CaloUtils
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          DetectorDescription/Identifier
+                          GaudiKernel
+                          TileCalorimeter/TileConditions
+                          TileCalorimeter/TileEvent
+                          TileCalorimeter/TileIdentifier
+                          PRIVATE
+                          Calorimeter/CaloDetDescr
+                          Calorimeter/CaloEvent
+                          Control/AthAllocators
+                          Control/StoreGate
+                          DetectorDescription/GeoModel/GeoModelInterfaces
+                          Event/EventContainers
+                          Event/xAOD/xAODEventInfo
+                          TileCalorimeter/TileCalib/TileCalibBlobObjs
+                          TileCalorimeter/TileDetDescr
+                          Tools/PathResolver )
+
+# External dependencies:
+find_package( Boost COMPONENTS filesystem thread system )
+find_package( CLHEP )
+
+# Component(s) in the package:
+atlas_add_library( TileRecUtilsLib
+                   src/Tile*.cxx
+                   PUBLIC_HEADERS TileRecUtils
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+                   DEFINITIONS ${CLHEP_DEFINITIONS}
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel Identifier GaudiKernel TileEvent TileIdentifier CaloUtilsLib TileConditionsLib CaloDetDescrLib StoreGateLib SGtests
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CaloEvent AthAllocators xAODEventInfo TileCalibBlobObjs TileDetDescr PathResolver )
+
+atlas_add_component( TileRecUtils
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier CaloUtilsLib AthenaBaseComps AthenaKernel Identifier GaudiKernel TileConditionsLib TileEvent TileIdentifier CaloDetDescrLib CaloEvent AthAllocators StoreGateLib SGtests xAODEventInfo TileCalibBlobObjs TileDetDescr PathResolver TileRecUtilsLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+

TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderMF.h

@@ -22,8 +22,7 @@
 
 // Tile includes
 #include "TileRecUtils/TileRawChannelBuilder.h"
-#include "TileConditions/TileCondToolOfc.h"
-#include "TileConditions/TileCondToolOfcCool.h"
+#include "TileConditions/ITileCondToolOfc.h"
 #include "TileConditions/TileCondToolTiming.h"
 #include "TileConditions/TileCondToolNoiseSample.h"
 
@@ -50,7 +49,7 @@ class TileRawChannelBuilderMF: public TileRawChannelBuilder {
   private:
     ToolHandle<TileCondToolTiming> m_tileToolTiming;
     ToolHandle<ITileCondToolOfc> m_tileCondToolOfc;
-    ToolHandle<ITileCondToolOfc> m_tileCondToolOfcCool;
+    ToolHandle<ITileCondToolOfc> m_tileCondToolOfcOnFly;
     ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample;
 
     bool are3FF(float &dmin, float &dmax); //!< Checks that all the samples are 0x3FF (as sent by the DSP when no data arrives)
@@ -66,7 +65,6 @@ class TileRawChannelBuilderMF: public TileRawChannelBuilder {
     double m_minTime; //!< min allowed time = -25*(m_nSamples-1)/2
 
     bool m_bestPhase; // if true, use best phase from COOL DB in "fixed phase" mode (i.e., no iterations)
-    bool m_ofcFromCool; // if true, take OFCs from DB (no on-fly calculations)
     bool m_timeFromCOF; // if true, take time estimated from second step of COF
 
     std::vector<float> m_digits;

TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOpt2Filter.h

@@ -20,7 +20,6 @@
 // Tile includes
 #include "TileRecUtils/TileRawChannelBuilder.h"
 #include "TileConditions/ITileCondToolOfc.h"
-#include "TileConditions/TileCondToolOfcCool.h"
 #include "TileConditions/TileCondToolTiming.h"
 #include "TileConditions/TileCondToolNoiseSample.h"
 
@@ -72,23 +71,17 @@ class TileRawChannelBuilderOpt2Filter: public TileRawChannelBuilder {
 
     ToolHandle<TileCondToolTiming> m_tileToolTiming;
     ToolHandle<ITileCondToolOfc> m_tileCondToolOfc;
-    ToolHandle<TileCondToolOfcCool> m_tileCondToolOfcCool;
     ToolHandle<TileCondToolNoiseSample> m_tileToolNoiseSample; //!< tool which provides noise values
 
     //!< Applies OF algorithm
     double filter(int ros, int drawer, int channel, int &gain, double &pedestal, double &amplitude, double &time);
     int findMaxDigitPosition();  //!< Finds maximum digit position in the pulse
-    //!< Sets pedestal estimation for OF1
-    float setPedestal(int ros, int drawer, int channel, int gain);
+    //!< Gets pedestal estimation for OF1
+    float getPedestal(int ros, int drawer, int channel, int gain);
     //!< Apply the number of iterations needed for reconstruction by calling the Filter method
-    int iterate(int ros, int drawer, int channel, int gain, double &pedestal, double &amplitude, double &time,
-        double &chi2);
+    int iterate(int ros, int drawer, int channel, int gain, double &pedestal, double &amplitude, double &time, double &chi2);
     //!< Computes A,time,ped using OF. If iterations are required, the Iterator method is used
-    double compute(int ros, int drawer, int channel, int gain, double &pedestal, double &amplitude, double &time,
-        double phase);
-
-//    void BuildPulseShape(std::vector<double> &m_pulseShape, std::vector<double> &m_pulseShapeX
-//        , std::vector<double> &m_pulseShapeT, int dignum, MsgStream &log); //!< Builds pulse shapes
+    double compute(int ros, int drawer, int channel, int gain, double &pedestal, double &amplitude, double &time, double& phase);
 
     void ofc2int(int nDigits, double* w_off, short* w_int, short& scale); // convert weights to dsp short int format
 
@@ -102,7 +95,6 @@ class TileRawChannelBuilderOpt2Filter: public TileRawChannelBuilder {
     bool m_correctTimeNI; //!< If true, resulting time is corrected when using method  without iteration
 
     bool m_bestPhase; // if true, use best phase from COOL DB in "fixed phase" mode (i.e., no iterations)
-    bool m_ofcFromCool; // if true, take OFCs from DB (no on-fly calculations)
     bool m_emulateDsp; // if true, emulate DSP reconstruction algorithm
     int m_nSignal; //!< internal counters
     int m_nNegative;  //!< internal counters
@@ -114,15 +106,6 @@ class TileRawChannelBuilderOpt2Filter: public TileRawChannelBuilder {
     double m_maxTime; //!< max allowed time = 25*(m_nSamples-1)/2
     double m_minTime; //!< min allowed time = -25*(m_nSamples-1)/2
 
-//    std::vector<double> m_LpulseShape_cis;  //!< vector for low gain/CIS pulse shape
-//    std::vector<double> m_HpulseShape_cis;  //!< vector for high gain/CIS pulse shape
-//    std::vector<double> m_LpulseShape_phys; //!< vector for low gain/Physics pulse shape
-//    std::vector<double> m_HpulseShape_phys; //!< vector for high gain/Physics pulse shape
-//
-//    std::vector<double> m_LdpulseShape_cis;  //!< vector for low gain/CIS pulse derivative
-//    std::vector<double> m_HdpulseShape_cis;  //!< vector for high gain/CIS pulse derivative
-//    std::vector<double> m_LdpulseShape_phys; //!< vector for low gain/Physics pulse derivative
-//    std::vector<double> m_HdpulseShape_phys; //!< vector for high gain/Physics pulse derivative
 
     std::vector<float> m_digits;
 };

TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelBuilderOptFilter.h

@@ -64,7 +64,7 @@ class TileRawChannelBuilderOptFilter: public TileRawChannelBuilder {
     float findMaxDigit(); //!< Finds maximum digit value in the pulse
     int findMaxDigitPosition();  //!< Finds maximum digit position in the pulse
     bool are3FF(); //!< Checks that all the samples are 0x3FF (as sent by the DSP when no data arrives)
-    float setPedestal(); //!< Sets pedestal estimation for OF1
+    float getPedestal(); //!< Gets pedestal estimation for OF1
     //!< Apply the number of iterations needed for reconstruction by calling the Filter method
     int iterate(int ros, int drawer, int channel, int gain, double &pedestal, double &amplitude, double &time,
         double &chi2);

TileCalorimeter/TileRecUtils/TileRecUtils/TileRawChannelNoiseFilter.h

@@ -16,6 +16,7 @@
 // Tile includes
 #include "TileIdentifier/TileRawChannelUnit.h"
 #include "TileRecUtils/ITileRawChannelTool.h"
+#include "TileConditions/TileCondToolEmscale.h"
 
 // forward declarations
 class TileHWID;
@@ -23,7 +24,7 @@ class TileRawChannel;
 class TileRawChannelContainer;
 class TileRawChannelCollection;
 class ITileBadChanTool;
-class TileCondToolEmscale;
+//class TileCondToolEmscale;
 class TileCondToolNoiseSample;
 class TileBeamInfoProvider;