From fd9379117400237126b35512b6d90ec02c4e0f7d Mon Sep 17 00:00:00 2001
From: Floris Keizer <keizer@hep.phy.cam.ac.uk>
Date: Mon, 5 Feb 2018 11:27:41 +0000
Subject: [PATCH] Remove track time from 64-bit smart id (already stored in MC
 data)

---
 Sim/GaussCherenkov/GaussCherenkov/CkvG4Hit.h        |  8 --------
 .../CherenkovAnalysis/CherenkovG4HistoHitTime.cpp   |  1 -
 Sim/GaussCherenkov/src/SensDet/CkvG4Hit.cpp         |  3 ---
 Sim/GaussCherenkov/src/SensDet/GetMCCkvHitsAlg.cpp  | 13 ++-----------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/Sim/GaussCherenkov/GaussCherenkov/CkvG4Hit.h b/Sim/GaussCherenkov/GaussCherenkov/CkvG4Hit.h
index 2afaa7f80..43171c581 100644
--- a/Sim/GaussCherenkov/GaussCherenkov/CkvG4Hit.h
+++ b/Sim/GaussCherenkov/GaussCherenkov/CkvG4Hit.h
@@ -96,8 +96,6 @@ private:
   G4double m_RichChTrackMass;          ///< PDG mass of the Mother of the optical photon.
   // Only with RichVerboseTag mode
 
-  G4double m_TrackStartTime;
-
   G4ThreeVector m_ChTrackCkvPreStepPos; ///< Prestep position of charged track during cherenkov  step.
   // Only with RichVerboseTag mode
 
@@ -299,12 +297,6 @@ public:
   inline G4double RichHitGlobalTime() const
   { return  m_RichHitGlobalTime; }
 
-  inline void SetTrackStartTime(const G4double aTrackStartTime )
-  { m_TrackStartTime= aTrackStartTime; }
-
-  inline G4double TrackStartTime() const 
-  { return m_TrackStartTime; }
-
   inline void SetRichChTrackMass (const G4double aRichTrackMass )
   { m_RichChTrackMass=aRichTrackMass; }
 
diff --git a/Sim/GaussCherenkov/src/CherenkovAnalysis/CherenkovG4HistoHitTime.cpp b/Sim/GaussCherenkov/src/CherenkovAnalysis/CherenkovG4HistoHitTime.cpp
index 3e3424799..db7a6ce04 100644
--- a/Sim/GaussCherenkov/src/CherenkovAnalysis/CherenkovG4HistoHitTime.cpp
+++ b/Sim/GaussCherenkov/src/CherenkovAnalysis/CherenkovG4HistoHitTime.cpp
@@ -191,7 +191,6 @@ void CherenkovG4HistoHitTime::FillG4NtupHitTime(const G4Event* anEvent, int  Num
             
 	  }
 	  
-	  aHit -> SetTrackStartTime( aTrackStartTime );
           m_aChOriginTime = aTrackStartTime;
           
           m_aChPartTotMom = aHit -> ChTrackTotMom() ;
diff --git a/Sim/GaussCherenkov/src/SensDet/CkvG4Hit.cpp b/Sim/GaussCherenkov/src/SensDet/CkvG4Hit.cpp
index c3aeeae17..96404815d 100644
--- a/Sim/GaussCherenkov/src/SensDet/CkvG4Hit.cpp
+++ b/Sim/GaussCherenkov/src/SensDet/CkvG4Hit.cpp
@@ -211,9 +211,6 @@ void CkvG4Hit::Print()
   G4cout<<"RichHit Global Time = "
         <<m_RichHitGlobalTime<<G4endl;
 
-  G4cout<<"Track Start Time = "
-	<<m_TrackStartTime<<G4endl;
-
   G4cout<<" RichG4Hit Verbose Hit Output Flag:  "
         << m_RichVerboseHitInfo<<G4endl;
 
diff --git a/Sim/GaussCherenkov/src/SensDet/GetMCCkvHitsAlg.cpp b/Sim/GaussCherenkov/src/SensDet/GetMCCkvHitsAlg.cpp
index f2bb3cf66..b1c7a270a 100755
--- a/Sim/GaussCherenkov/src/SensDet/GetMCCkvHitsAlg.cpp
+++ b/Sim/GaussCherenkov/src/SensDet/GetMCCkvHitsAlg.cpp
@@ -271,17 +271,8 @@ StatusCode GetMCCkvHitsAlg::execute()
 
 	LHCb::RichSmartID detID = assembleMCPmtRichSmartID(g4hit,isGrandPmtHitFlag); 
 
-	// Set hit time and track time in smartID
-	detID.setTime(      detID.floatNADC<16>( g4hit->RichHitGlobalTime(),0.,100. ) );
-	detID.setTrackTime( detID.floatNADC<16>( g4hit->TrackStartTime(),-10.,60. ) );
-
-	// info() << "G4 Time "                 << g4hit->RichHitGlobalTime() 
-	//        << "\t ADC Time "             << detID.floatNADC<16>( g4hit->RichHitGlobalTime(),0.,100. ) 
-	//        << "\t Recovered Time "       << detID.ADCNfloat<16>( detID.time(),0.,100. ) 
-	//        << "\n G4 TrackStartTime "    << g4hit->TrackStartTime() 
-	//        << "\t ADC Track Time "       << detID.floatNADC<16>( g4hit->TrackStartTime(),-10.,60. )
-	//        << "\t Recovered Track Time " << detID.ADCNfloat<16>( detID.trackTime(),-10.,60. ) 
-	//        << endmsg;
+	// Set hit time in smartID
+	detID.setTime( detID.floatNADC<16>( g4hit->RichHitGlobalTime(),0.,100. ) );
 
         if ( !detID.isValid() )
 	{
-- 
GitLab