From a7b45302927453e6966b8e804177e790a2e8b53f Mon Sep 17 00:00:00 2001
From: Fang Wenxing <wxfang@lxslc711.ihep.ac.cn>
Date: Mon, 28 Sep 2020 15:49:56 +0800
Subject: [PATCH] change G4ThreeVector to DDRec Vector3D
---
Digitisers/DCHDigi/CMakeLists.txt | 2 --
Digitisers/DCHDigi/src/DCHDigiAlg.cpp | 14 +++++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index e49e0692..33fa374e 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -1,7 +1,5 @@
gaudi_subdir(DCHDigi v0r0)
-find_package(Geant4 REQUIRED ui_all vis_all)
-include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
find_package(EDM4HEP REQUIRED )
message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
index f77f0118..d4089bbf 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
@@ -8,7 +8,7 @@
#include "DD4hep/Detector.h"
#include <DD4hep/Objects.h>
-#include "G4ThreeVector.hh"
+#include "DDRec/Vector3D.h"
#include <array>
@@ -90,12 +90,12 @@ StatusCode DCHDigiAlg::execute()
float min_distance = 999 ;
for(unsigned int i=0; i< simhit_size; i++)
{
- G4ThreeVector west(0,0,0);
- G4ThreeVector east(0,0,0);
- G4ThreeVector pos(iter->second.at(i).getPosition()[0], iter->second.at(i).getPosition()[1], iter->second.at(i).getPosition()[2]);
- G4ThreeVector numerator = (east-west).cross(west-pos) ;
- G4ThreeVector denominator = (east-west) ;
- float distance = numerator.mag()/denominator.mag() ;
+ dd4hep::rec::Vector3D west(0,0,0);
+ dd4hep::rec::Vector3D east(0,0,0);
+ dd4hep::rec::Vector3D pos(iter->second.at(i).getPosition()[0], iter->second.at(i).getPosition()[1], iter->second.at(i).getPosition()[2]);
+ dd4hep::rec::Vector3D numerator = (east-west).cross(west-pos) ;
+ dd4hep::rec::Vector3D denominator = (east-west) ;
+ float distance = numerator.r()/denominator.r() ;
std::cout<<"distance="<<distance<<std::endl;
if(distance < min_distance){
min_distance = distance;
--
GitLab