diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp index 67b36859b7cd4991c9082de4bff9ce1d39c1e2e3..634698ce11ffbb74d3002b21205e5ecb61e1b6d2 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 911a6f4cb3c2c7e64a741cc40ec0d15303176031..77e9bfa568c0be1638868f056b4a18d4daa892ca 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 b6cc05850ddd6c663f6b3f6231a5c844e136c8e7..5c59f2006a259ec19adb8ba1a425640eff9465a9 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 927c7b27df4f558e5702eef1871af082acc2160e..21a8404118d99b45309f4e523980cb1a3f66849e 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 6effe0a29e66225da31d48ac669852fad6deefcf..cc6a53127bfd38354f3e6110e0ddc20ade5b6442 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