diff --git a/DDExamples/AlignDet/src/BoxDetector_geo.cpp b/DDExamples/AlignDet/src/BoxDetector_geo.cpp index d8d82dfa170d789727ccd9bcd11d71c157e828c2..eadd759adfa30a641fadea4346100c108de4ca2a 100644 --- a/DDExamples/AlignDet/src/BoxDetector_geo.cpp +++ b/DDExamples/AlignDet/src/BoxDetector_geo.cpp @@ -25,7 +25,7 @@ static Ref_t create_element(LCDD& lcdd, const xml_h& e, SensitiveDetector&) { det_vol.setVisAttributes(lcdd, x_det.visStr()); PlacedVolume phv = mother.placeVolume(det_vol,Position(pos.x(),pos.y(),pos.z()), - Rotation(rot.x(),rot.y(),rot.z())); + Rotation(rot.z(),rot.y(),rot.x())); phv.addPhysVolID("id",x_det.id()); det.setPlacement(phv); return det; diff --git a/DDExamples/CLICSiDSimu/src/SteppingAction.cpp b/DDExamples/CLICSiDSimu/src/SteppingAction.cpp index 63fb162f6ad056cced3fae73044124f63a2fb2a6..d463331797acdc4f0ed2b031231e79437804b089 100644 --- a/DDExamples/CLICSiDSimu/src/SteppingAction.cpp +++ b/DDExamples/CLICSiDSimu/src/SteppingAction.cpp @@ -49,17 +49,17 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep) { Position pos1 = step.prePos(); Position pos2 = step.postPos(); - Momentum mom = step.postMom(); + Momentum mom = step.postMom(); if ( step.sd(step.pre) ) { - double len = (pos2-pos1).length(); + double len = (pos2-pos1).R(); ::printf(" Track:%08ld pos:%.0f Len:%.1f SD:%s [%s] Deposit:%.0f keV\n", - long(step.track),pos2.length()/cm,len/cm,step.sdName(step.pre,"----"), step.preStepStatus(), + long(step.track),pos2.R()/cm,len/cm,step.sdName(step.pre,"----"), step.preStepStatus(), edep/keV); } #if 0 ::printf(" Track:%08ld Pos:(%8f %8f %8f) -> (%f %f %f) Mom:%7.0f %7.0f %7.0f \n", - long(step.track), pos1.x, pos1.y, pos1.z, pos2.x, pos2.y, pos2.z, mom.x, mom.y, mom.z); + long(step.track), pos1.X(), pos1.Y(), pos1.Z(), pos2.X(), pos2.Y(), pos2.Z(), mom.X(), mom.Y(), mom.Z()); ::printf(" pre-Vol: %s Status:%s SD:%s\n", step.volName(step.pre,"----"), step.preStepStatus(), step.sdName(step.pre,"----")); ::printf(" post-Vol:%s Status:%s SD:%s\n", diff --git a/DDExamples/ILDExReco/src/GearTPC.cpp b/DDExamples/ILDExReco/src/GearTPC.cpp index 3c00eae2801b88288df5b18580eed6c8c2ad1108..b5fc9ed081d89ac068bb8f4f67184bd1fd2cc179 100644 --- a/DDExamples/ILDExReco/src/GearTPC.cpp +++ b/DDExamples/ILDExReco/src/GearTPC.cpp @@ -131,7 +131,7 @@ namespace DD4hep { { Position global(c0,c1,zpos), local; it->second.worldToLocal(global,local); - Double_t point_local[3]={local.x,local.y,local.z}; + Double_t point_local[3]={local.X(),local.Y(),local.Z()}; onMod=it->second.volume().solid()->Contains(point_local); if(onMod) { @@ -159,7 +159,7 @@ namespace DD4hep { //trafo of input world coordinates to local module system Position global(c0,c1,zpos), local; it->second.worldToLocal(global,local); - Double_t point_local[3]={local.x,local.y,local.z}; + Double_t point_local[3]={local.X(),local.Y(),local.Z()}; onMod=it->second.volume().solid()->Contains(point_local); if(onMod) diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake index 17e7ff8d53f9d02814b216bca94130ed74a33c8d..27f7d1cee735966e5dfc4d1cb91dd416dfd51c5e 100644 --- a/cmake/FindROOT.cmake +++ b/cmake/FindROOT.cmake @@ -38,6 +38,8 @@ if(ROOT_CONFIG_EXECUTABLE) endif() +set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lGenVector) + # handle the QUIETLY and REQUIRED arguments and set ROOT_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs)