Merge branch '22.0-sanitise-TrigT1NSWSimTools' into 'master'

22.0-sanitise-TrigT1NSWSimTools

See merge request atlas/athena!16560

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMLoadVariables.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MMLOADVARIABLES_H
 #define MMLOADVARIABLES_H
 
-//basic includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIncidentListener.h"
 
-#include "GaudiKernel/Property.h"
+//C++ language libraries
+#include <map>
+#include <vector>
+#include <string>
 
+#include "MMT_struct.h" //for digitWrapper, hitData_key, hitData_entry, evInf_entry
+#include "AthenaBaseComps/AthMsgStreamMacros.h"
 
 //forward declarations
-//class IIncidentSvc;
-//class IAtRndmGenSvc;
+class MsgStream;
 class MmIdHelper;
 class MmDigit;
-class TTree;
+class StoreGateSvc;
+class MMT_Parameters;
+class MmDigitContainer;
+class TVector3;
 
-//C++ language libararies
-#include <dirent.h>
-#include <map>
-#include <vector>
-#include <string>
-#include <fstream>
-#include <cmath>
-#include <cstdlib>
-#include <cstdio>
-#include <iostream>
-
-//Muon Software Includes
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
-#include "MuonReadoutGeometry/MMReadoutElement.h"
-#include "MuonIdHelpers/MmIdHelper.h"
-#include "MuonDigitContainer/MmDigitContainer.h"
-#include "MuonDigitContainer/MmDigit.h"
-#include "MuonSimData/MuonSimDataCollection.h"
-#include "MuonSimData/MuonSimData.h"
-#include "MuonSimEvent/GenericMuonSimHitCollection.h"
-#include "MuonSimEvent/MM_SimIdToOfflineId.h"
-//#include "MuonReadoutGeometry/NSWenumeration.h"
-//#include "MuonReadoutGeometry/NSWgeometry.h"
-#include "GeneratorObjects/McEventCollection.h"
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "AthenaBaseComps/AthMsgStreamMacros.h"
-#include "TrackRecord/TrackRecordCollection.h"
-#include "CLHEP/Vector/ThreeVector.h"
-
-//ROOT libraries
-#include "TMultiGraph.h"
-#include "TCanvas.h"
-#include "TColor.h"
-#include "TGraphErrors.h"
-#include "TLatex.h"
-#include "TStyle.h"
-#include "TH2D.h"
-#include "Rtypes.h"
-#include "TTree.h"
-#include "TFile.h"
-#include "TObject.h"
-#include "TROOT.h"
-#include "TH1F.h"
-#include "TRandom3.h"
-#include "TF1.h"
-#include "TLorentzVector.h"
-#include "MMT_struct.h"
-#include "MMT_Finder.h"
-#include "MMT_Fitter.h"
 namespace MuonGM {
   class MuonDetectorManager;
 }
@@ -83,36 +36,16 @@ namespace MuonGM {
    ~MMLoadVariables();
 
     void getMMDigitsInfo(std::vector<digitWrapper>& entries, std::map<hitData_key,hitData_entry>& Hits_Data_Set_Time, std::map<int,evInf_entry>& Event_Info);
-
-    std::string nom;
-
-    //std::map<hitData_key,hitData_entry> Hits_Data_Set_Time;//key is hit_index? <BC_time,time>?
-
-    //VMM info
-    std::vector<std::vector<bool> > VMM_chip_status;
-    std::vector<std::vector<int> > VMM__chip_last_hit_time;
-    bool Mimic_VMM_Chip_Deadtime(hitData_entry& candy);
-    double VMM_deadtime;
-    int num_VMM_per_plane;
-
     //Import_Athena..._.m stuff
     double phi_shift(double athena_phi,std::string wedgeType, int stationPhi) const;
     int Get_VMM_chip(int strip) const;  //*** Not Finished... Rough
     int strip_number(int station,int plane,int spos)const;
     int Get_Strip_ID(double X,double Y,int plane) const;
-
-    //x <---> u/v switches
-    bool uvxxmod;
+    bool Mimic_VMM_Chip_Deadtime(hitData_entry& candy);
     void xxuv_to_uvxx(TVector3& hit,int plane)const;
     void hit_rot_stereo_fwd(TVector3& hit)const;//x to v, u to x
     void hit_rot_stereo_bck(TVector3& hit)const;//x to u, v to x
 
-    //Hist stuff
-    //TH1::SetDefaultSumw2();
-    //TH1D *m_fit_the;
-    //event counter should be fixed when code is better understood
-    int evtcount = 0;
-
     struct histogramVariables{
         std::vector<std::string> *m_NSWMM_dig_stationName;
         std::vector<int> NSWMM_dig_stationEta;
@@ -201,15 +134,44 @@ namespace MuonGM {
         std::vector<int> NSWMM_off_channel;
     };
     histogramVariables histVars;
+    
+    protected:
+    /// Log a message using the Athena controlled logging system
+      MsgStream&
+      msg(MSG::Level lvl) const {
+        return m_msg.get() << lvl;
+      }
+   
+      /// Check whether the logging system is active at the provided verbosity level
+      bool
+      msgLvl(MSG::Level lvl) {
+        return m_msg.get().level() <= lvl;
+      }
+   
+      /// Private message stream member
+      mutable Athena::MsgStreamMember m_msg;
 
 
-  private:
 
-    const MuonGM::MuonDetectorManager* m_detManager;        //!< MuonDetectorManager
-    const MmIdHelper*                  m_MmIdHelper;        //!< MM offline Id helper
-    StoreGateSvc*                      m_evtStore;
-    MMT_Parameters* m_par;
-    bool m_striphack = false;
+  private:
+  
+  //moved here
+     //VMM info
+    std::vector<std::vector<bool> > m_VMM_ChipStatus{};
+    std::vector<std::vector<int> > m_VMM_ChipLastHitTime{};
+
+    double m_VMM_Deadtime{};
+    int m_numVMM_PerPlane{};
+    //x <---> u/v switches
+    bool m_uvxxmod{};
+    
+    //
+
+    const MuonGM::MuonDetectorManager* m_detManager{};        //!< MuonDetectorManager
+    const MmIdHelper*                  m_MmIdHelper{};        //!< MM offline Id helper
+    StoreGateSvc*                      m_evtStore{};
+    MMT_Parameters* m_par{};
+    bool m_striphack{};
     std::string getWedgeType(const MmDigitContainer *nsw_MmDigitContainer);
 
 

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMTriggerTool.h

@@ -6,11 +6,14 @@
 #define MMTRIGGERTOOL_H
 
 //basic includes
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/IIncidentListener.h"
 
 //local includes
 #include "TrigT1NSWSimTools/IMMTriggerTool.h"
 
 
+
 //forward declarations
 class IIncidentSvc;
 class IAtRndmGenSvc;

Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx

@@ -2,6 +2,10 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
+// local includes
+#include "TrigT1NSWSimTools/MMTriggerTool.h"
+#include "TrigT1NSWSimTools/MMT_Finder.h"
+#include "TrigT1NSWSimTools/MMT_Fitter.h"
 // Athena/Gaudi includes
 #include "GaudiKernel/ITHistSvc.h"
 #include "GaudiKernel/IIncidentSvc.h"
@@ -9,8 +13,7 @@
 #include "AthenaBaseComps/AthMsgStreamMacros.h"
 
 
-// local includes
-#include "TrigT1NSWSimTools/MMTriggerTool.h"
+
 
 //Event info includes
 #include "EventInfo/EventInfo.h"