diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp index bb02ad39e3d2347af6a5a9ee76ee51593227d3d7..6b3a0c1003ba4335292fc095e02c880dfe2fde26 100644 --- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp +++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber.cpp @@ -84,10 +84,10 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector, dd4hep::Tube det_chamber_solid(chamber_radius_min, chamber_radius_max, chamber_half_length); dd4hep::Volume det_chamber_vol(det_name+"_chamber_vol", det_chamber_solid, chamber_mat); if ( x_det.isSensitive() ) { - det_chamber_vol.setRegion(theDetector,x_det.regionStr()); - det_chamber_vol.setLimitSet(theDetector,x_det.limitsStr()); - det_chamber_vol.setSensitiveDetector(sens); - sd.setType("tracker"); + det_chamber_vol.setRegion(theDetector,x_det.regionStr()); + det_chamber_vol.setLimitSet(theDetector,x_det.limitsStr()); + det_chamber_vol.setSensitiveDetector(sens); + sd.setType("tracker"); } // - wall @@ -185,7 +185,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector, // | | // | F0 F1 F2 F3| // ----------------------- -// if(layer_id == 0 || layer_id == 1 || layer_id == 2 || layer_id == 99) { + if(layer_id == 0 || layer_id == 1 || layer_id == 2 || layer_id == 99) { for(int icell=0; icell< numWire; icell++) { double wire_phi = (icell+0.5)*layer_Phi + offset; // - signal wire @@ -208,7 +208,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector, } } -// } + } // - place in det // - chamber diff --git a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp index 6f88f5898faf2ce84fb3ae4d1f4410fcb521a0bb..9389a525c9a8d8b7df6ed112ca281cccda9c931d 100644 --- a/Digitisers/DCHDigi/src/DCHDigiAlg.cpp +++ b/Digitisers/DCHDigi/src/DCHDigiAlg.cpp @@ -149,6 +149,7 @@ StatusCode DCHDigiAlg::execute() TVector3 numerator = denominator.Cross(Wstart-pos) ; float tmp_distance = numerator.Mag()/denominator.Mag() ; //std::cout<<"tmp_distance="<<tmp_distance<<",x="<<pos.x()<<",y="<<pos.y()<<",z="<<pos.z()<<",mom="<<sim_hit_mom<<",pt="<<sim_hit_pt<<std::endl; + if(tmp_distance < min_distance){ min_distance = tmp_distance; pos_x = pos.x(); @@ -169,7 +170,7 @@ StatusCode DCHDigiAlg::execute() m_n_sim ++ ; } } - + trkHit.setTime(min_distance*1e3/m_velocity);//m_velocity is um/ns, drift time in ns trkHit.setEDep(tot_edep);// GeV trkHit.setEdx (tot_edep/tot_length); // GeV/mm