From 6bfda1af5ce5ef59387deed5806adb1cfd8af093 Mon Sep 17 00:00:00 2001
From: myliu <201916234@mail.sdu.edu.cn>
Date: Mon, 11 Mar 2024 19:54:55 +0800
Subject: [PATCH] Update DriftChamber construct
---
Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp | 3 ---
.../DetSegmentation/include/DetSegmentation/GridDriftChamber.h | 2 --
Detector/DetSegmentation/src/GridDriftChamber.cpp | 1 -
Digitisers/DCHDigi/src/DCHDigiAlg.cpp | 3 ---
Digitisers/DCHDigi/src/DCHDigiAlg.h | 1 -
5 files changed, 10 deletions(-)
diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
index 67b36859..634698ce 100644
--- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
+++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp
@@ -171,7 +171,6 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
offset = 0.5 * cell_phi;
}
double epsilon = sign_eps*std::atan(rmid_zZero * std::tan(alpha / 2.0) / chamber_half_length);
- //double alpha0 = 2*std::asin(chamber_length * std::tan(epsilon)/(2*rmid_zEnd));
segmentationDC->setGeomParams(chamber_id, layer_id, cell_phi, rmid_zEnd , epsilon, offset);
segmentationDC->setWiresInLayer(chamber_id, layer_id, nCell);
@@ -241,8 +240,6 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
}//end of loop over cell
dd4hep::Transform3D transform_layer(dd4hep::Rotation3D(),
dd4hep::Position(0,0,0));
- dd4hep::PlacedVolume layer_phy = det_chamber_vol.placeVolume(layer_vol,transform_layer);
- layer_phy.addPhysVolID("layer", layer_id);
}//end of loop over layers
diff --git a/Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h b/Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h
index 911a6f4c..77e9bfa5 100644
--- a/Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h
+++ b/Detector/DetSegmentation/include/DetSegmentation/GridDriftChamber.h
@@ -34,7 +34,6 @@ typedef struct CID
{
int chamberID;
int layerID;
-// CID(){}
CID(int i, int j): chamberID(i),layerID(j){}
// the operator < defines the operation used in map
friend bool operator < (const CID &c1, const CID &c2);
@@ -176,7 +175,6 @@ protected:
}
double m_cellSize;
-// double m_epsilon0;
double m_detectorLength;
double m_layer_width;
double m_DC_rbegin;
diff --git a/Detector/DetSegmentation/src/GridDriftChamber.cpp b/Detector/DetSegmentation/src/GridDriftChamber.cpp
index b6cc0585..5c59f200 100644
--- a/Detector/DetSegmentation/src/GridDriftChamber.cpp
+++ b/Detector/DetSegmentation/src/GridDriftChamber.cpp
@@ -329,6 +329,5 @@ double GridDriftChamber::Distance(const CellID& cID, const TVector3& pointIn, co
return distance;
}
-
}
}
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
index 927c7b27..21a84041 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp
@@ -167,9 +167,6 @@ StatusCode DCHDigiAlg::execute()
TVector3 Wend (0,0,0);
m_segmentation->cellposition(wcellid, Wstart, Wend);
float dd4hep_mm = dd4hep::mm;
- //std::cout<<"dd4hep_mm="<<dd4hep_mm<<std::endl;
- // Wstart =(1/dd4hep_mm)* Wstart;// from DD4HEP cm to mm
- // Wend =(1/dd4hep_mm)* Wend ;
if(m_debug) std::cout<<"DCHDigi wcellid ="<<wcellid<< ",chamber="<<chamber<<",layer="<<layer<<",cellID="<<cellID<<",s_x="<<Wstart.x()<<",s_y="<<Wstart.y()<<",s_z="<<Wstart.z()<<",E_x="<<Wend.x()<<",E_y="<<Wend.y()<<",E_z="<<Wend.z()<<std::endl;
TVector3 denominator = (Wend-Wstart) ;
diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.h b/Digitisers/DCHDigi/src/DCHDigiAlg.h
index 6effe0a2..cc6a5312 100644
--- a/Digitisers/DCHDigi/src/DCHDigiAlg.h
+++ b/Digitisers/DCHDigi/src/DCHDigiAlg.h
@@ -96,7 +96,6 @@ protected:
Gaudi::Property<bool> m_debug{ this, "debug", false};
Gaudi::Property<double> m_wireEff{ this, "wireEff", 1.0};
-
// Input collections
DataHandle<edm4hep::SimTrackerHitCollection> r_SimDCHCol{"DriftChamberHitsCollection", Gaudi::DataHandle::Reader, this};
// Output collections
--
GitLab