diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/src/Core/Archives.cpp b/src/Core/Archives.cpp index 017868d..3929c27 100644 --- a/src/Core/Archives.cpp +++ b/src/Core/Archives.cpp @@ -39,6 +39,8 @@ #include #include +#include + #include #include @@ -87,6 +89,45 @@ template class xml_oarchive_impl ; +//////////////////////////////////////////////////////////////////////////////// +// XML GRAMMAR STUBS ///////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// +// +// WARNING: this stubs were added because misteriously the implementation of +// this templated methods are missing.... +// +// +template +bool basic_xml_grammar::parse_start_tag(basic_xml_grammar::IStream &is) +{} +// +template +bool basic_xml_grammar::parse_end_tag(basic_xml_grammar::IStream &is) +const {} +// +template +bool basic_xml_grammar::parse_string(basic_xml_grammar::IStream &is, basic_xml_grammar::StringType &s) +{} +// +template +void basic_xml_grammar::init(basic_xml_grammar::IStream &is) +{} +// +template +bool basic_xml_grammar::windup(basic_xml_grammar::IStream &is) +{} +// +template +basic_xml_grammar::basic_xml_grammar() +{} +// +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + + } // namespace archive } // namespace boost + + + diff --git a/src/Core/Archives.h b/src/Core/Archives.h index d9f9071..9a7d21d 100644 --- a/src/Core/Archives.h +++ b/src/Core/Archives.h @@ -173,7 +173,7 @@ public: } template Archive & operator>>(T & t){ - this->This()->load_override(t, 0); + this->This()->load_override(t); return * this->This(); } @@ -231,7 +231,7 @@ public: Archive & operator<<(T & t){ // to get access you must redefine save_override by typing // "using save_override" in archive impl - this->This()->save_override(t, 0); + this->This()->save_override(t); return * this->This(); } @@ -707,8 +707,8 @@ public: } template - void save_override(T & t, BOOST_PFTO int){ - base::save_override(boost::serialization::make_nvp(NULL, t), 0); + void save_override(T & t){ + base::save_override(boost::serialization::make_nvp(NULL, t)); } // activate this if you want to trap non nvp objects // diff --git a/src/Core/Function.h b/src/Core/Function.h index 632dbb4..cc137eb 100644 --- a/src/Core/Function.h +++ b/src/Core/Function.h @@ -59,31 +59,31 @@ namespace detail { // return a reference to function ... as the boost signal signature wants template -struct FunctionTypes {}; +struct function_types {}; template -struct FunctionTypes< R(O::*)() > { +struct function_types< R(O::*)() > { typedef R ref(); typedef R (ptr)(); typedef O obj; }; template -struct FunctionTypes< R(O::*)(T0) > { +struct function_types< R(O::*)(T0) > { typedef R ref(T0); typedef R (ptr)(T0); typedef O obj; }; template -struct FunctionTypes< R(O::*)(T0,T1) > { +struct function_types< R(O::*)(T0,T1) > { typedef R ref(T0,T1); typedef R (ptr)(T0,T1); typedef O obj; }; template -struct FunctionTypes< R(O::*)(T0,T1,T2) > { +struct function_types< R(O::*)(T0,T1,T2) > { typedef R ref(T0,T1,T2); typedef R (ptr)(T0,T1,T2); typedef O obj; @@ -102,14 +102,14 @@ struct FunctionTypes< R(O::*)(T0,T1,T2) > { template struct FunctionTypes { typedef typename boost::function_types::function_type::type Signature; - typedef typename detail::FunctionTypes::ref SignalSignature; + typedef typename detail::function_types::ref SignalSignature; enum { arity = boost::function_types::function_arity::value, ismfp = boost::is_member_function_pointer::value }; - + typedef boost::mpl::bool_< ismfp > HasObjectType; - typedef typename detail::FunctionTypes::obj Object; + typedef typename detail::function_types::obj Object; typedef boost::function_traits< Signature > Traits; virtual void PrintSelf( std::ostream &o ) { diff --git a/src/Core/Object.cpp b/src/Core/Object.cpp index d361d71..5b87d54 100644 --- a/src/Core/Object.cpp +++ b/src/Core/Object.cpp @@ -44,8 +44,8 @@ namespace uLib { -const char *Version::PackageName = PACKAGE_NAME; -const char *Version::VersionNumber = PACKAGE_VERSION; +const char *Version::PackageName = ""; //PACKAGE_NAME; +const char *Version::VersionNumber = ""; //PACKAGE_VERSION; const char *Version::Release = ""; //SVN_REVISION; @@ -120,7 +120,7 @@ void Object::LoadXml(std::istream &is, Object &ob) // FINIRE void Object::SaveConfig(std::ostream &os, int version) -{ +{ Archive::xml_oarchive ar(os); ObjectPropable::serialize(ar,0); } diff --git a/src/Core/testing/FunctionTest.cpp b/src/Core/testing/FunctionTest.cpp index 2bbf6d7..b714334 100644 --- a/src/Core/testing/FunctionTest.cpp +++ b/src/Core/testing/FunctionTest.cpp @@ -117,15 +117,15 @@ int main() { ProgrammableAccessor f1(&TestVoxel::m_data); ProgrammableAccessor f2(&TestVoxel::ConstGet); - ProgrammableAccessorAny f3(&TestVoxel::m_data); - ProgrammableAccessor f4(&TestVoxel::m_data); +// ProgrammableAccessorAny f3(&TestVoxel::m_data); +// ProgrammableAccessor f4(&TestVoxel::m_data); int i=0; foreach (TestVoxel &el,v) { f1.Set(&el,i++); - std::cout << " -> " << f2.Get(&el) << " - " << f3.Get(&el) << f4.Get(&el) << f1(&el).Get() << "\n"; + std::cout << " -> " << f2.Get(&el) << " - " << f1(&el).Get() << "\n"; } diff --git a/src/Detectors/HitMC.h b/src/Detectors/HitMC.h index 95404b2..a0f8fdc 100644 --- a/src/Detectors/HitMC.h +++ b/src/Detectors/HitMC.h @@ -47,7 +47,7 @@ public: uLibGetMacro(Type, enum Type) private: - HPoint3f m_Position; + Vector4f m_Position; enum Type m_Type; }; diff --git a/src/Math/DataSet.h b/src/Math/DataSet.h index 526b88c..211041a 100644 --- a/src/Math/DataSet.h +++ b/src/Math/DataSet.h @@ -37,7 +37,7 @@ #include #include -#include +// #include namespace uLib { diff --git a/src/Math/Dense.h b/src/Math/Dense.h index a2d5f80..7b24bfa 100644 --- a/src/Math/Dense.h +++ b/src/Math/Dense.h @@ -372,8 +372,6 @@ typedef double Scalard; //} - - //struct _HError3f //{ // Vector4f position_error; diff --git a/src/Math/Line.h b/src/Math/Line.h index f1c0d52..872e196 100644 --- a/src/Math/Line.h +++ b/src/Math/Line.h @@ -61,10 +61,12 @@ typedef Line Line3f; typedef Line Line4f; typedef Line4f HLine3f; + } // uLib + //ULIB_SERIALIZABLE(uLib::Line2f) //ULIB_SERIALIZABLE(uLib::Line3f) //ULIB_SERIALIZABLE(uLib::Line4f) diff --git a/src/Math/VectorSpace.h b/src/Math/VectorSpace.h index 61600cd..a3515b1 100644 --- a/src/Math/VectorSpace.h +++ b/src/Math/VectorSpace.h @@ -35,10 +35,10 @@ namespace uLib { //////////////////////////////////////////////////////////////////////////////// -inline Vector4f HVector3f(float x, float y, float z) { return Vector4f(x,y,z,0); } +inline Vector4f HVector3f(float x=0, float y=0, float z=0) { return Vector4f(x,y,z,0); } inline Vector4f HVector3f(const Vector4f &v) { return Vector4f(v(0),v(1),v(2),0); } -inline Vector4f HPoint3f(float x, float y, float z) { return Vector4f(x,y,z,1); } +inline Vector4f HPoint3f(float x=0, float y=0, float z=0) { return Vector4f(x,y,z,1); } inline Vector4f HPoint3f(const Vector4f &v) { return Vector4f(v(0),v(1),v(2),1); } diff --git a/src/Math/VoxImage.h b/src/Math/VoxImage.h index f537d4d..a7af189 100644 --- a/src/Math/VoxImage.h +++ b/src/Math/VoxImage.h @@ -31,6 +31,7 @@ #include "Core/Vector.h" #include "Core/StaticInterface.h" #include "Math/Dense.h" +#include "Math/VectorSpace.h" #include "Math/ImageData.h" #include @@ -138,6 +139,14 @@ public: inline VoxImage clipImage(const float density) const; + inline VoxImage maskImage(const Vector4f begin, const Vector4f end, float value) const; + inline VoxImage maskImage(const float threshold, float belowValue=0, float aboveValue=0) const; + inline VoxImage fixVoxels(const float threshold, float tolerance) const; + inline VoxImage fixVoxels(const float threshold, float tolerance, const Vector4f begin, const Vector4f end) const; + inline VoxImage fixVoxelsAroundPlane(const float threshold, float tolerance, const Vector4f begin, const Vector4f end, bool aboveAir) const; + inline VoxImage fixVoxels(const Vector4f begin, const Vector4f end) const; + inline VoxImage Abs() const; + inline void SelectScalarfComponent(T &element, Scalarf *scalar); inline void InitVoxels(T t); @@ -264,6 +273,198 @@ VoxImage VoxImage::clipImage(const float density) const return this->clipImage(v1,v2); } +template +VoxImage VoxImage::maskImage(const Vector4f begin, const Vector4f end, float value) const +{ + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + Vector3i voxB = this->Find(begin); + Vector3i voxE = this->Find(end); + + Vector3i ID; + + for(int ix=voxB(0); ix +VoxImage VoxImage::maskImage(const float threshold, float belowValue, float aboveValue) const +{ + std::cout << "VoxImage: maskImage, fixing voxels under threshold " << threshold; + if(belowValue) + std::cout << " at value " << belowValue; + else + std::cout << " at -value"; + std::cout << ", voxels above threshold at value "; + if(aboveValue) + std::cout << aboveValue; + else + std::cout << "found"; + + + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + for(uint i=0; i< this->m_Data.size(); ++i) { + // skip negative voxels: they are already frozen + if( this->GetValue(i) >= 0 ){ + // voxels under threshold + if( this->GetValue(i) <= threshold*1.E-6 ){ + if(belowValue){ + out.SetValue(i,-1.*belowValue*1.E-6);} + else + out.SetValue(i,-1.*this->GetValue(i)); + } + // voxels over threshold + else{ + if(aboveValue) + out.SetValue(i,aboveValue*1.E-6); + else + out.SetValue(i,this->GetValue(i)); + } + } + } + return out; +} + +template +VoxImage VoxImage::fixVoxels(const float threshold, float tolerance) const +{ + std::cout << "VoxImage: fixing voxels with value " << threshold << std::endl; + + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + for(uint i=0; i< this->m_Data.size(); ++i) { + // voxels around threshold + if( fabs(this->GetValue(i) - threshold*1.E-6) < tolerance* 1.E-6 ){ + out.SetValue(i,-1.*this->GetValue(i)); + } + } + return out; +} + +template +VoxImage VoxImage::Abs() const +{ + std::cout << "VoxImage: set abs voxels value " << std::endl; + + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + for(uint i=0; i< this->m_Data.size(); ++i) + out.SetValue(i,fabs(this->GetValue(i))); + + return out; +} + +template +VoxImage VoxImage::fixVoxels( const float threshold, float tolerance, const Vector4f begin, const Vector4f end) const +{ + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + Vector3i voxB = this->Find(begin); + Vector3i voxE = this->Find(end); + + Vector3i ID; + + for(int ix=voxB(0); ixGetValue(ID) - threshold*1.E-6) < tolerance*1.E-6 ){ + out.SetValue(ID,-1.*this->GetValue(ID)); + } + } + + return out; +} + +template +VoxImage VoxImage::fixVoxels(const Vector4f begin, const Vector4f end) const +{ + VoxImage out(*this); + out.SetDims(this->GetDims()); + out.SetPosition(this->GetPosition()); + + Vector3i voxB = this->Find(begin); + Vector3i voxE = this->Find(end); + + Vector3i ID; + + for(int ix=voxB(0); ixGetValue(ID)); + } + return out; +} + + +template +VoxImage VoxImage::fixVoxelsAroundPlane( const float threshold, float tolerance, const Vector4f B, const Vector4f E, bool aboveAir) const +{ + VoxImage out(*this); + Vector3i dim = this->GetDims(); + out.SetDims(dim); + out.SetPosition(this->GetPosition()); + + Vector4f Bcoll = this->GetPosition().homogeneous(); + + Vector3i ID; + for(int ix=0; ix().cwiseProduct(this->GetSpacing())); + Vector4f v4 = Vector4f(v(0),v(1),v(2),1); + Vector4f Bvox = Bcoll + v4; + Vector4f Evox = Bvox + this->GetSpacing().homogeneous(); + Vector4f V = Bvox + 0.5*(this->GetSpacing().homogeneous()); + + // if distance point (x0,y0) from line by points (x1,y1) and (x2,y2) is less than tolerance + float x1 = B[1]; + float y1 = B[2]; + float x2 = E[1]; + float y2 = E[2]; + float x0 = V[1]; + float y0 = V[2]; + float dist = fabs( (x2-x1)*(y1-y0) - ((x1-x0)*(y2-y1))) / sqrt( (x2-x1)*(x2-x1)+((y2-y1)*(y2-y1))); + float distSign = (x2-x1)*(y1-y0) - ((x1-x0)*(y2-y1)); + + // set voxel air value + if(dist < tolerance){ + //std::cout << "voxel " << iv << ", line " << dist << ", tolerance " << tolerance << std::endl; + out.SetValue(ID,threshold*1.E-6); + } + else + out.SetValue(ID,this->GetValue(ID)); + + if((distSign>0 && aboveAir) || (distSign<0 && !aboveAir) ) + out.SetValue(ID,threshold*1.E-6); + } + return out; +} + template void VoxImage::InitVoxels(T t) diff --git a/src/Math/VoxRaytracer.cpp b/src/Math/VoxRaytracer.cpp index cea0f10..ab29ad3 100644 --- a/src/Math/VoxRaytracer.cpp +++ b/src/Math/VoxRaytracer.cpp @@ -198,5 +198,50 @@ const return ray; } +// 20150528 SV for absorbed muons +VoxRaytracer::RayData VoxRaytracer::TraceLine(const HLine3f &line) const +{ + RayData ray; + + Vector4f pt = m_Image->GetLocalPoint(line.origin()); + Vector4f s = m_Image->GetLocalPoint(line.direction()); + + float l = s.head(3).norm(); + // intersection between track and grid when spacing is +1 + Vector3f L(l/s(0), l/s(1), l/s(2)); + + // RayTracer works with a grid of interspace +1 + // Vector3f scale; // FIXXX + // scale << (m_Image->GetWorldMatrix() * Vector4f(1,0,0,0)).norm(), + // (m_Image->GetWorldMatrix() * Vector4f(0,1,0,0)).norm(), + // (m_Image->GetWorldMatrix() * Vector4f(0,0,1,0)).norm(); + + // offset is the fraction of the segment between grid lines when origin is insiede voxel + // cwiseAbs for having positive distances + Vector3f offset; + for(int i=0;i<3;++i) + offset(i) = (s(i)>=0) - (pt(i)-floor(pt(i))); + offset = offset.cwiseProduct(L).cwiseAbs(); + L = L.cwiseAbs(); + + int id; float d; + Vector3i vid = m_Image->Find(line.origin()); + while(m_Image->IsInsideGrid(vid)) + { + // minimun coefficient of offset: id is the coordinate, d is the value + // dependig on which grid line horizontal or vertical it is first intercept + d = offset.minCoeff(&id); + + // add Lij to ray + ray.AddElement(m_Image->Map(vid), d * m_scale(id) ); + + // move to the next voxel + vid(id) += (int)fast_sign(s(id)); + + offset.array() -= d; + offset(id) = L(id); + } + return ray; +} } diff --git a/src/Math/VoxRaytracer.h b/src/Math/VoxRaytracer.h index fae697c..90f659a 100644 --- a/src/Math/VoxRaytracer.h +++ b/src/Math/VoxRaytracer.h @@ -65,7 +65,12 @@ public: public: - VoxRaytracer(ImageData &image) : m_Image(&image) {} + VoxRaytracer(ImageData &image) : m_Image(&image) { + m_scale << + (m_Image->GetWorldMatrix() * Vector4f(1,0,0,0)).norm(), + (m_Image->GetWorldMatrix() * Vector4f(0,1,0,0)).norm(), + (m_Image->GetWorldMatrix() * Vector4f(0,0,1,0)).norm(); + } bool GetEntryPoint(const HLine3f line, Vector4f &pt) const; @@ -73,10 +78,13 @@ public: RayData TraceBetweenPoints(const Vector4f &in, const Vector4f &out) const; + RayData TraceLine(const HLine3f &line) const; + uLibGetMacro(Image,ImageData *) private: ImageData *m_Image; + Vector3f m_scale; }; } diff --git a/src/Math/testing/VoxRaytracerTest.cpp b/src/Math/testing/VoxRaytracerTest.cpp index 73f045d..c030719 100644 --- a/src/Math/testing/VoxRaytracerTest.cpp +++ b/src/Math/testing/VoxRaytracerTest.cpp @@ -63,20 +63,20 @@ int main() { HLine3f line; - line.origin << 0.1, 4.1, 0.1, 1; - line.direction << 0.1, -0.1, 0.1,0; + line.origin() << 0.1, 4.1, 0.1, 1; + line.direction() << 0.1, -0.1, 0.1,0; Raytracer rt(img); - HPoint3f pt; + Vector4f pt; TEST1( rt.GetEntryPoint(line,pt) ); TEST0( Vector4f0( pt - HPoint3f(0.2,4,0.2) ) ); } { HLine3f line; - line.origin << 4,0,4, 1; - line.direction << -0.1, 0.1, -0.1, 0; + line.origin() << 4,0,4, 1; + line.direction() << -0.1, 0.1, -0.1, 0; Raytracer rt(img); - HPoint3f pt; + Vector4f pt; TEST1( rt.GetEntryPoint(line,pt) ); TEST0( Vector4f0( pt - HPoint3f(2,2,2) ) ); } @@ -86,9 +86,9 @@ int main() img.SetSpacing(Vector3f(2,2,2)); img.SetPosition(Vector3f(-4,-4,-4)); Raytracer ray(img); - HPoint3f pt; + Vector4f pt; HLine3f line; - line.origin = HPoint3f(-3,-3,-3); + line.origin() = HPoint3f(-3,-3,-3); // line.direction = HVector3f(1,1,1); // TEST1( ray.GetEntryPoint(line,pt) ); TEST1( pt == HPoint3f(-3,-3,-3) ); diff --git a/src/ParticlePhysics/MuonTomography/MuonScatter.h b/src/ParticlePhysics/MuonTomography/MuonScatter.h index 67b195f..ba03f2c 100644 --- a/src/ParticlePhysics/MuonTomography/MuonScatter.h +++ b/src/ParticlePhysics/MuonTomography/MuonScatter.h @@ -32,6 +32,7 @@ #include "Core/Serializable.h" #include "Math/Dense.h" +#include "Math/Line.h" namespace uLib { @@ -56,7 +57,7 @@ public: ULIB_SERIALIZABLE(uLib::MuonTrack) ULIB_SERIALIZE(uLib::MuonTrack) { - ar & AR(line); + ar & AR(track); } diff --git a/src/Root/CMakeLists.txt b/src/Root/CMakeLists.txt index 06086b3..fd2ca43 100644 --- a/src/Root/CMakeLists.txt +++ b/src/Root/CMakeLists.txt @@ -32,7 +32,7 @@ include(FindROOTv6) root_generate_dictionary(uLibRootDict ${DICTIONARY_HEADERS} LINKDEF Linkdef.h) set_source_files_properties(uLibRootDict.cxx PROPERTIES GENERATED TRUE) set_source_files_properties(uLibRootDict.h PROPERTIES GENERATED TRUE) -list(APPEND SOURCES uLibRootDict.cxx) +# list(APPEND SOURCES uLibRootDict.cxx) uLib_add_shared_library(${uLib-module}) diff --git a/src/Root/RootMathDense.h b/src/Root/RootMathDense.h index 1435d77..8651177 100644 --- a/src/Root/RootMathDense.h +++ b/src/Root/RootMathDense.h @@ -28,6 +28,7 @@ #ifndef ROOTMATHDENSE_H #define ROOTMATHDENSE_H +#include #include #include diff --git a/src/Root/TestTObject.h b/src/Root/TestTObject.h index d7041e7..4141a56 100644 --- a/src/Root/TestTObject.h +++ b/src/Root/TestTObject.h @@ -28,11 +28,25 @@ #ifndef U_ROOT_TESTTOBJECT_H #define U_ROOT_TESTTOBJECT_H + +#if __cplusplus >= 201703L +#else +namespace std { +class string_view { +public: + string_view(const char *) {} + string_view(const char *,int) {} +}; +} // std +#endif + + #include #include #include #include + class TestTObject : public TObject { public: int a,b,c; diff --git a/src/Root/testing/RootDebugTest.cpp b/src/Root/testing/RootDebugTest.cpp index 7a44b53..2740aff 100644 --- a/src/Root/testing/RootDebugTest.cpp +++ b/src/Root/testing/RootDebugTest.cpp @@ -80,10 +80,10 @@ int main(int argc,char **argv) { tree->Fill(); - u_mu.LineIn().origin << 3,3,3; - u_mu.LineIn().direction << 5,5,5; - u_mu.LineOut().origin << 1,2,3; - u_mu.LineOut().direction << 4,5,6; + u_mu.LineIn().origin() << 3,3,3; + u_mu.LineIn().direction() << 5,5,5; + u_mu.LineOut().origin() << 1,2,3; + u_mu.LineOut().direction() << 4,5,6; u_mu.SetMomentum(555); u_mu.SetMomentumPrime(2368); diff --git a/src/Vtk/testing/vtkMuonScatter.cpp b/src/Vtk/testing/vtkMuonScatter.cpp index 2c9e7ca..5260031 100644 --- a/src/Vtk/testing/vtkMuonScatter.cpp +++ b/src/Vtk/testing/vtkMuonScatter.cpp @@ -37,11 +37,11 @@ using namespace uLib; int main() { MuonScatter event; - event.LineIn().direction << 0, -1, 1, 0; - event.LineIn().origin << 0, 1, -1, 1; + event.LineIn().direction() << 0, -1, 1, 0; + event.LineIn().origin() << 0, 1, -1, 1; - event.LineOut().direction << 0, -1, 0, 0; - event.LineOut().origin << 0, -1, 0, 1; + event.LineOut().direction() << 0, -1, 0, 0; + event.LineOut().origin() << 0, -1, 0, 1; Vtk::vtkMuonScatter v_event(event); v_event.AddPocaPoint(HPoint3f(0,0,0)); diff --git a/src/Vtk/vtkMuonContainerScattering.h b/src/Vtk/vtkMuonContainerScattering.h index b1ef9be..0f5c77b 100644 --- a/src/Vtk/vtkMuonContainerScattering.h +++ b/src/Vtk/vtkMuonContainerScattering.h @@ -54,9 +54,9 @@ public: virtual vtkPolyData* GetPolyData() const; - void AddPocaPoint(HPoint3f poca); + void AddPocaPoint(Vector4f poca); - HPoint3f GetPocaPoint(); + Vector4f GetPocaPoint(); void vtkStartInteractive(); diff --git a/src/Vtk/vtkMuonEvent.cxx b/src/Vtk/vtkMuonEvent.cxx index db34b24..4d0054a 100644 --- a/src/Vtk/vtkMuonEvent.cxx +++ b/src/Vtk/vtkMuonEvent.cxx @@ -96,7 +96,7 @@ public: vtkAppendPolyData *m_Appender; vtkBoxWidget *m_WidgetIN, *m_WidgetOUT; - HPoint3f m_Poca; + Vector4f m_Poca; }; @@ -163,7 +163,7 @@ void vtkMuonEvent::InstallPipe() float distance = (d->content->LineIn().origin - d->content->LineOut().origin).norm() / 10; - HPoint3f pt; + Vector4f pt; pt = d->content->LineIn().origin; line_in->SetPoint1(pt(0),pt(1),pt(2)); pt= d->content->LineIn().origin + d->content->LineIn().direction * distance; @@ -188,7 +188,7 @@ vtkPolyData *vtkMuonEvent::GetPolyData() const return d->m_Appender->GetOutput(); } -void vtkMuonEvent::AddPocaPoint(HPoint3f poca) +void vtkMuonEvent::AddPocaPoint(Vector4f poca) { d->m_Poca = poca; vtkSmartPointer sphere = @@ -202,7 +202,7 @@ void vtkMuonEvent::AddPocaPoint(HPoint3f poca) d->m_Appender->Update(); } -HPoint3f vtkMuonEvent::GetPocaPoint() +Vector4f vtkMuonEvent::GetPocaPoint() { return d->m_Poca; } diff --git a/src/Vtk/vtkMuonEvent.h b/src/Vtk/vtkMuonEvent.h index 310fc08..54f9b98 100644 --- a/src/Vtk/vtkMuonEvent.h +++ b/src/Vtk/vtkMuonEvent.h @@ -54,9 +54,9 @@ public: virtual vtkPolyData* GetPolyData() const; - void AddPocaPoint(HPoint3f poca); + void AddPocaPoint(Vector4f poca); - HPoint3f GetPocaPoint(); + Vector4f GetPocaPoint(); void vtkStartInteractive(); diff --git a/src/utils/make_recipe/CMakeLists.txt b/src/utils/make_recipe/CMakeLists.txt index 66cc8d9..6dfd870 100644 --- a/src/utils/make_recipe/CMakeLists.txt +++ b/src/utils/make_recipe/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties(recipe_tar_data PROPERTIES LINKER_LANGUAGE C) set(CMAKE_TAR_FILE "cmake.tar.gz") add_custom_command(OUTPUT cmake_tar_data.o - COMMAND tar -zcvf ${CMAKE_TAR_FILE} -C ${PROJECT_SOURCE_DIR} CMake "--exclude=CMake/.svn" + COMMAND tar -zcvf ${CMAKE_TAR_FILE} -C ${PROJECT_SOURCE_DIR} CMake COMMAND objcopy --input binary --output elf64-x86-64 --binary-architecture i386 ${CMAKE_TAR_FILE} ${CMAKE_CURRENT_BINARY_DIR}/cmake_tar_data.o ) diff --git a/tmp/c_vtable/main.c b/tmp/c_vtable/main.c index 3757de2..d2453b6 100644 --- a/tmp/c_vtable/main.c +++ b/tmp/c_vtable/main.c @@ -19,7 +19,6 @@ int main() return 0; } - #else diff --git a/uLib.files b/uLib.files index ca84601..3fdcc67 100644 --- a/uLib.files +++ b/uLib.files @@ -1,210 +1,13 @@ -build/CMakeFiles/3.2.2/CompilerIdC/CMakeCCompilerId.c -build/CMakeFiles/3.2.2/CompilerIdCXX/CMakeCXXCompilerId.cpp -build/CMakeFiles/3.2.2/CMakeCCompiler.cmake -build/CMakeFiles/3.2.2/CMakeCXXCompiler.cmake -build/CMakeFiles/3.2.2/CMakeSystem.cmake -build/CMakeFiles/clean-cmake-files.dir/cmake_clean.cmake -build/CMakeFiles/clean-cmake-files.dir/DependInfo.cmake -build/CMakeFiles/Coretest.dir/cmake_clean.cmake -build/CMakeFiles/Coretest.dir/DependInfo.cmake -build/CMakeFiles/Export/_usr/local/lib/cmake/mutom-0.2/uLibTargets-relwithdebinfo.cmake -build/CMakeFiles/Export/_usr/local/lib/cmake/mutom-0.2/uLibTargets.cmake -build/CMakeFiles/CMakeDirectoryInformation.cmake -build/CMakeFiles/feature_tests.c -build/CMakeFiles/feature_tests.cxx -build/CMakeFiles/Makefile.cmake -build/CMakeFiles/uLibConfig.cmake -build/src/Core/CMakeFiles/mutomCore.dir/cmake_clean.cmake -build/src/Core/CMakeFiles/mutomCore.dir/DependInfo.cmake -build/src/Core/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Core/testing/CMakeFiles/all-Core-tests.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/all-Core-tests.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/BoostAccumulatorTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/BoostAccumulatorTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/BoostTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/BoostTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ClassCompoundTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ClassCompoundTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ClassFactoryRuntimeTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ClassFactoryRuntimeTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ClassFactoryTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ClassFactoryTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/CommaInitTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/CommaInitTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/DebugTTreeDumpTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/DebugTTreeDumpTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/DreadDiamondParameters.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/DreadDiamondParameters.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/FunctionTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/FunctionTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/MplSequenceCombinerTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/MplSequenceCombinerTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/MplSequenceReplaceElTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/MplSequenceReplaceElTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ObjectCopyTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ObjectCopyTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ObjectFlagsTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ObjectFlagsTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ObjectParametersTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ObjectParametersTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ObjectPropableTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ObjectPropableTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/OptionsTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/OptionsTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/ProgrammableAccessorTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/ProgrammableAccessorTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/PropertiesTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/PropertiesTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/SerializeDreadDiamondTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/SerializeDreadDiamondTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/SerializeTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/SerializeTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/SignalTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/SignalTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/SmartVectorTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/SmartVectorTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/StaticInterfaceTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/StaticInterfaceTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/TypeIntrospectionTraversal.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/TypeIntrospectionTraversal.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/UuidTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/UuidTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/VectorTest.dir/cmake_clean.cmake -build/src/Core/testing/CMakeFiles/VectorTest.dir/DependInfo.cmake -build/src/Core/testing/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Core/testing/cmake_install.cmake -build/src/Core/testing/CTestTestfile.cmake -build/src/Core/testing/Makefile -build/src/Core/cmake_install.cmake -build/src/Core/CTestTestfile.cmake -build/src/Core/Makefile -build/src/Detectors/CMakeFiles/mutomDetectors.dir/cmake_clean.cmake -build/src/Detectors/CMakeFiles/mutomDetectors.dir/DependInfo.cmake -build/src/Detectors/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Detectors/testing/CMakeFiles/all-Detectors-tests.dir/cmake_clean.cmake -build/src/Detectors/testing/CMakeFiles/all-Detectors-tests.dir/DependInfo.cmake -build/src/Detectors/testing/CMakeFiles/GDMLSolidTest.dir/cmake_clean.cmake -build/src/Detectors/testing/CMakeFiles/GDMLSolidTest.dir/DependInfo.cmake -build/src/Detectors/testing/CMakeFiles/HierarchicalEncodingTest.dir/cmake_clean.cmake -build/src/Detectors/testing/CMakeFiles/HierarchicalEncodingTest.dir/DependInfo.cmake -build/src/Detectors/testing/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Detectors/testing/cmake_install.cmake -build/src/Detectors/testing/CTestTestfile.cmake -build/src/Detectors/testing/Makefile -build/src/Detectors/cmake_install.cmake -build/src/Detectors/CTestTestfile.cmake -build/src/Detectors/Makefile -build/src/ltk/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/ltk/cmake_install.cmake -build/src/ltk/CTestTestfile.cmake -build/src/ltk/Makefile -build/src/Math/CMakeFiles/mutomMath.dir/cmake_clean.cmake -build/src/Math/CMakeFiles/mutomMath.dir/DependInfo.cmake -build/src/Math/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Math/testing/CMakeFiles/AccumulatorTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/AccumulatorTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/all-Math-tests.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/all-Math-tests.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/BitCodeTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/BitCodeTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/ContainerBoxTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/ContainerBoxTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/GeometryTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/GeometryTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/ImageDataTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/ImageDataTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/MathVectorTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/MathVectorTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/PolicyTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/PolicyTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/StructuredDataTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/StructuredDataTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/StructuredGridTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/StructuredGridTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/TriangleMeshTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/TriangleMeshTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/VoxImageCopyTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/VoxImageCopyTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/VoxImageFilterTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/VoxImageFilterTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/VoxImageTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/VoxImageTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/VoxRaytracerTest.dir/cmake_clean.cmake -build/src/Math/testing/CMakeFiles/VoxRaytracerTest.dir/DependInfo.cmake -build/src/Math/testing/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Math/testing/cmake_install.cmake -build/src/Math/testing/CTestTestfile.cmake -build/src/Math/testing/Makefile -build/src/Math/cmake_install.cmake -build/src/Math/CTestTestfile.cmake -build/src/Math/Makefile -build/src/Root/CMakeFiles/mutomRoot.dir/cmake_clean.cmake -build/src/Root/CMakeFiles/mutomRoot.dir/DependInfo.cmake -build/src/Root/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Root/testing/CMakeFiles/all-Root-tests.dir/cmake_clean.cmake -build/src/Root/testing/CMakeFiles/all-Root-tests.dir/DependInfo.cmake -build/src/Root/testing/CMakeFiles/RootDebugTest.dir/cmake_clean.cmake -build/src/Root/testing/CMakeFiles/RootDebugTest.dir/DependInfo.cmake -build/src/Root/testing/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Root/testing/cmake_install.cmake -build/src/Root/testing/CTestTestfile.cmake -build/src/Root/testing/Makefile -build/src/Root/cmake_install.cmake -build/src/Root/CTestTestfile.cmake -build/src/Root/Makefile -build/src/Root/uLibRootDict.cxx -build/src/utils/make_recipe/CMakeFiles/cmake_tar_data.dir/cmake_clean.cmake -build/src/utils/make_recipe/CMakeFiles/cmake_tar_data.dir/cmake_clean_target.cmake -build/src/utils/make_recipe/CMakeFiles/cmake_tar_data.dir/DependInfo.cmake -build/src/utils/make_recipe/CMakeFiles/recipe_tar_data.dir/cmake_clean.cmake -build/src/utils/make_recipe/CMakeFiles/recipe_tar_data.dir/cmake_clean_target.cmake -build/src/utils/make_recipe/CMakeFiles/recipe_tar_data.dir/DependInfo.cmake -build/src/utils/make_recipe/CMakeFiles/uLib_config.dir/cmake_clean.cmake -build/src/utils/make_recipe/CMakeFiles/uLib_config.dir/DependInfo.cmake -build/src/utils/make_recipe/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/utils/make_recipe/cmake_install.cmake -build/src/utils/make_recipe/CTestTestfile.cmake -build/src/utils/make_recipe/Makefile -build/src/Vtk/CMakeFiles/mutomVtk.dir/cmake_clean.cmake -build/src/Vtk/CMakeFiles/mutomVtk.dir/DependInfo.cmake -build/src/Vtk/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Vtk/testing/CMakeFiles/all-Vtk-tests.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/all-Vtk-tests.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkContainerBoxTest.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkContainerBoxTest.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkMuonScatter.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkMuonScatter.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkStructuredGridTest.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkStructuredGridTest.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkViewerTest.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkViewerTest.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkVoxImageTest.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkVoxImageTest.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/vtkVoxRaytracerTest.dir/cmake_clean.cmake -build/src/Vtk/testing/CMakeFiles/vtkVoxRaytracerTest.dir/DependInfo.cmake -build/src/Vtk/testing/CMakeFiles/CMakeDirectoryInformation.cmake -build/src/Vtk/testing/cmake_install.cmake -build/src/Vtk/testing/CTestTestfile.cmake -build/src/Vtk/testing/Makefile -build/src/Vtk/cmake_install.cmake -build/src/Vtk/CTestTestfile.cmake -build/src/Vtk/Makefile -build/cmake_install.cmake -build/config.h -build/CTestTestfile.cmake -build/Makefile -build/uLibConfig.cmake -build/uLibConfigVersion.cmake -build/uLibTargets.cmake -CMake/clean-all.cmake +AUTHORS CMake/FindEigen3.cmake CMake/FindGEANT4.cmake CMake/FindGEANT4VMC.cmake -CMake/FindReadLine.cmake CMake/FindROOT.cmake CMake/FindROOTv6.cmake -CMake/FinduLib.cmake +CMake/FindReadLine.cmake CMake/FindVTK.cmake +CMake/FinduLib.cmake +CMake/clean-all.cmake CMake/rmake.in CMake/uLibCommon.cmake CMake/uLibConfigHeader.cmake @@ -213,75 +16,31 @@ CMake/uLibFindDependencies.cmake CMake/uLibGenerateRMake.cmake CMake/uLibMacros.cmake CMake/uLibTargetMacros.cmake +CMakeConfig.in.h +CMakeLists.txt +CMakePkgConfig.pc.in +ChangeLog +Common.am +NEWS +README +SCRATCH.org +bootstrap +configure.ac +libmutom-0.2.pc.in m4/boost.m4 +m4/geant4.bkp m4/geant4.m4 m4/openmp.m4 m4/root.m4 m4/vtk.m4 m4/zeromq.m4 -src/Core/testing/ObjectMock/main.cpp -src/Core/testing/ObjectMock/Makefile.am -src/Core/testing/ObjectMock/Ob.cpp -src/Core/testing/ObjectMock/Ob.h -src/Core/testing/ObjectMock/Ob1.cpp -src/Core/testing/ObjectMock/Ob1.h -src/Core/testing/ObjectMock/Ob2.cpp -src/Core/testing/ObjectMock/Ob2.h -src/Core/testing/ObjectMock/testing-prototype.h -src/Core/testing/SerializeMock/main.cpp -src/Core/testing/SerializeMock/Makefile.am -src/Core/testing/SerializeMock/Ob.cpp -src/Core/testing/SerializeMock/Ob.h -src/Core/testing/SerializeMock/Ob1.cpp -src/Core/testing/SerializeMock/Ob1.h -src/Core/testing/SignalMock/main.cpp -src/Core/testing/SignalMock/main2.cpp -src/Core/testing/SignalMock/Makefile.am -src/Core/testing/SignalMock/Ob.cpp -src/Core/testing/SignalMock/Ob.h -src/Core/testing/SignalMock/Ob1.cpp -src/Core/testing/SignalMock/Ob1.h -src/Core/testing/SignalMock/Ob2.cpp -src/Core/testing/SignalMock/Ob2.h -src/Core/testing/SignalMock/test1.cpp -src/Core/testing/SignalMock/testing-prototype.h -src/Core/testing/BoostAccumulatorTest.cpp -src/Core/testing/BoostTest.cpp -src/Core/testing/ClassCompoundTest.cpp -src/Core/testing/ClassFactoryRuntimeTest.cpp -src/Core/testing/ClassFactoryTest.cpp -src/Core/testing/CMakeLists.txt -src/Core/testing/CommaInitTest.cpp -src/Core/testing/DebugTTreeDumpTest.cpp -src/Core/testing/DreadDiamondParameters.cpp -src/Core/testing/Flags.h -src/Core/testing/FunctionTest.cpp -src/Core/testing/Makefile.am -src/Core/testing/MplSequenceCombinerTest.cpp -src/Core/testing/MplSequenceReplaceElTest.cpp -src/Core/testing/ObjectCopyTest.cpp -src/Core/testing/ObjectFlagsTest.cpp -src/Core/testing/ObjectParametersTest.cpp -src/Core/testing/ObjectPropableTest.cpp -src/Core/testing/OptionsTest.cpp -src/Core/testing/ProgrammableAccessorTest.cpp -src/Core/testing/PropertiesTest.cpp -src/Core/testing/SerializeDreadDiamondTest.cpp -src/Core/testing/SerializeTest.cpp -src/Core/testing/SignalTest.cpp -src/Core/testing/SmartPointerTest.cpp -src/Core/testing/SmartVectorTest.cpp -src/Core/testing/StaticInterfaceTest.cpp -src/Core/testing/testing-prototype.h -src/Core/testing/TypeIntrospectionTraversal.cpp -src/Core/testing/UuidTest.cpp -src/Core/testing/VectorTest.cpp src/Core/Archives.cpp src/Core/Archives.h src/Core/Array.h +src/Core/CMakeLists.txt +src/Core/ClassComposite.h src/Core/ClassCompound.h src/Core/ClassFactory.h -src/Core/CMakeLists.txt src/Core/Collection.h src/Core/CommaInitializer.h src/Core/Debug.cpp @@ -292,7 +51,6 @@ src/Core/Export.h src/Core/Flags.h src/Core/Function.h src/Core/Macros.h -src/Core/Makefile.am src/Core/Mpl.h src/Core/MplSequenceCombiner.h src/Core/Named.h @@ -315,13 +73,63 @@ src/Core/Types.h src/Core/Uuid.cpp src/Core/Uuid.h src/Core/Vector.h -src/Detectors/testing/CMakeLists.txt -src/Detectors/testing/GDMLSolidTest.cpp -src/Detectors/testing/HierarchicalEncodingTest.cpp -src/Detectors/testing/Makefile.am -src/Detectors/testing/testing-prototype.h -src/Detectors/ChamberHitEvent.h +src/Core/testing/BoostAccumulatorTest.cpp +src/Core/testing/BoostTest.cpp +src/Core/testing/CMakeLists.txt +src/Core/testing/ClassCompositeTest.cpp +src/Core/testing/ClassCompoundTest.cpp +src/Core/testing/ClassCompoundTest2.cpp +src/Core/testing/ClassFactoryRuntimeTest.cpp +src/Core/testing/ClassFactoryTest.cpp +src/Core/testing/CommaInitTest.cpp +src/Core/testing/DebugTTreeDumpTest.cpp +src/Core/testing/DreadDiamondParameters.cpp +src/Core/testing/Flags.h +src/Core/testing/FunctionTest.cpp +src/Core/testing/MplSequenceCombinerTest.cpp +src/Core/testing/MplSequenceReplaceElTest.cpp +src/Core/testing/ObjectCopyTest.cpp +src/Core/testing/ObjectFlagsTest.cpp +src/Core/testing/ObjectMock/Ob.cpp +src/Core/testing/ObjectMock/Ob.h +src/Core/testing/ObjectMock/Ob1.cpp +src/Core/testing/ObjectMock/Ob1.h +src/Core/testing/ObjectMock/Ob2.cpp +src/Core/testing/ObjectMock/Ob2.h +src/Core/testing/ObjectMock/main.cpp +src/Core/testing/ObjectMock/testing-prototype.h +src/Core/testing/ObjectParametersTest.cpp +src/Core/testing/ObjectPropableTest.cpp +src/Core/testing/OptionsTest.cpp +src/Core/testing/ProgrammableAccessorTest.cpp +src/Core/testing/PropertiesTest.cpp +src/Core/testing/SerializeDreadDiamondTest.cpp +src/Core/testing/SerializeMock/Ob.cpp +src/Core/testing/SerializeMock/Ob.h +src/Core/testing/SerializeMock/Ob1.cpp +src/Core/testing/SerializeMock/Ob1.h +src/Core/testing/SerializeMock/main.cpp +src/Core/testing/SerializeTest.cpp +src/Core/testing/SignalMock/Ob.cpp +src/Core/testing/SignalMock/Ob.h +src/Core/testing/SignalMock/Ob1.cpp +src/Core/testing/SignalMock/Ob1.h +src/Core/testing/SignalMock/Ob2.cpp +src/Core/testing/SignalMock/Ob2.h +src/Core/testing/SignalMock/main.cpp +src/Core/testing/SignalMock/main2.cpp +src/Core/testing/SignalMock/test1.cpp +src/Core/testing/SignalMock/testing-prototype.h +src/Core/testing/SignalTest.cpp +src/Core/testing/SmartPointerTest.cpp +src/Core/testing/SmartVectorTest.cpp +src/Core/testing/StaticInterfaceTest.cpp +src/Core/testing/TypeIntrospectionTraversal.cpp +src/Core/testing/UuidTest.cpp +src/Core/testing/VectorTest.cpp +src/Core/testing/testing-prototype.h src/Detectors/CMakeLists.txt +src/Detectors/ChamberHitEvent.h src/Detectors/DetectorChamber.h src/Detectors/ExperimentFitEvent.h src/Detectors/GeantEvent.h @@ -329,7 +137,6 @@ src/Detectors/HierarchicalEncoding.h src/Detectors/Hit.h src/Detectors/HitMC.h src/Detectors/LinearFit.h -src/Detectors/Makefile.am src/Detectors/Matter.h src/Detectors/MuonError.h src/Detectors/MuonEvent.h @@ -338,51 +145,15 @@ src/Detectors/Scene.cpp src/Detectors/Scene.h src/Detectors/Solid.cpp src/Detectors/Solid.h +src/Detectors/testing/CMakeLists.txt +src/Detectors/testing/GDMLSolidTest.cpp +src/Detectors/testing/HierarchicalEncodingTest.cpp +src/Detectors/testing/testing-prototype.h +src/Gui/Qt/QVTKViewport2/QVTKViewport2.pro src/Gui/Qt/QVTKViewport2/main.cpp -src/Gui/Qt/QVTKViewport2/Makefile.am src/Gui/Qt/QVTKViewport2/vtkviewport.cpp src/Gui/Qt/QVTKViewport2/vtkviewport.h -src/ltk/ltk_bridge/ltkb.c -src/ltk/ltk_bridge/ltkb_test.c -src/ltk/testing/Makefile.am -src/ltk/testing/Object-cc.cpp -src/ltk/testing/Object.c -src/ltk/testing/testing-prototype.h -src/ltk/testing/Vector-cc.cpp -src/ltk/testing/Vector.c -src/ltk/CMakeLists.txt -src/ltk/container.h -src/ltk/DenseMatrix.h -src/ltk/ltk.h -src/ltk/ltkdebug.c -src/ltk/ltkdebug.h -src/ltk/ltkmacros.h -src/ltk/ltktypes.h -src/ltk/main.c -src/ltk/Makefile.am -src/ltk/Object.c -src/ltk/Object.h -src/ltk/templates.c -src/ltk/templates.h -src/ltk/test_comma.h -src/ltk/Vector.h -src/Math/testing/AccumulatorTest.cpp -src/Math/testing/BitCodeTest.cpp -src/Math/testing/CMakeLists.txt -src/Math/testing/ContainerBoxTest.cpp -src/Math/testing/GeometryTest.cpp -src/Math/testing/ImageDataTest.cpp -src/Math/testing/Makefile.am -src/Math/testing/MathVectorTest.cpp -src/Math/testing/PolicyTest.cpp -src/Math/testing/StructuredDataTest.cpp -src/Math/testing/StructuredGridTest.cpp -src/Math/testing/testing-prototype.h -src/Math/testing/TriangleMeshTest.cpp -src/Math/testing/VoxImageCopyTest.cpp -src/Math/testing/VoxImageFilterTest.cpp -src/Math/testing/VoxImageTest.cpp -src/Math/testing/VoxRaytracerTest.cpp +src/Gui/Qt/QVTKViewport2/vtkviewport.ui src/Math/Accumulator.h src/Math/BitCode.h src/Math/CMakeLists.txt @@ -398,7 +169,6 @@ src/Math/ImageMap.h src/Math/ImageSpace.cpp src/Math/ImageSpace.h src/Math/Line.h -src/Math/Makefile.am src/Math/Polydata.h src/Math/Quote.h src/Math/StructuredData.cpp @@ -424,18 +194,28 @@ src/Math/VoxImageFilterThreshold.hpp src/Math/VoxImageFilterUser.cpp src/Math/VoxRaytracer.cpp src/Math/VoxRaytracer.h -src/ParticlePhysics/Geant/Makefile.am +src/Math/testing/AccumulatorTest.cpp +src/Math/testing/BitCodeTest.cpp +src/Math/testing/CMakeLists.txt +src/Math/testing/ContainerBoxTest.cpp +src/Math/testing/GeometryTest.cpp +src/Math/testing/ImageDataTest.cpp +src/Math/testing/MathVectorTest.cpp +src/Math/testing/PolicyTest.cpp +src/Math/testing/StructuredDataTest.cpp +src/Math/testing/StructuredGridTest.cpp +src/Math/testing/TriangleMeshTest.cpp +src/Math/testing/VoxImageCopyTest.cpp +src/Math/testing/VoxImageFilterTest.cpp +src/Math/testing/VoxImageTest.cpp +src/Math/testing/VoxRaytracerTest.cpp +src/Math/testing/testing-prototype.h src/ParticlePhysics/MuonTomography/DetectorChamber.h src/ParticlePhysics/MuonTomography/DriftDetector.h src/ParticlePhysics/MuonTomography/Hit.h -src/ParticlePhysics/MuonTomography/Makefile.am src/ParticlePhysics/MuonTomography/MuonScatter.h -src/Root/testing/CMakeLists.txt -src/Root/testing/Makefile.am -src/Root/testing/RootDebugTest.cpp src/Root/CMakeLists.txt src/Root/Linkdef.h -src/Root/Makefile.am src/Root/RootHitMC.h src/Root/RootHitRaw.h src/Root/RootMathDense.h @@ -443,37 +223,13 @@ src/Root/RootMuonScatter.cpp src/Root/RootMuonScatter.h src/Root/TestTObject.cpp src/Root/TestTObject.h -src/utils/copyrights/cr_update.py -src/utils/make_recipe/src/CMake/clean-all.cmake -src/utils/make_recipe/src/CMake/FindEigen3.cmake -src/utils/make_recipe/src/CMake/FindGEANT4.cmake -src/utils/make_recipe/src/CMake/FindGEANT4VMC.cmake -src/utils/make_recipe/src/CMake/FindReadLine.cmake -src/utils/make_recipe/src/CMake/FindROOT.cmake -src/utils/make_recipe/src/CMake/FindROOTv6.cmake -src/utils/make_recipe/src/CMake/FinduLib.cmake -src/utils/make_recipe/src/CMake/FindVTK.cmake -src/utils/make_recipe/src/CMake/rmake.in -src/utils/make_recipe/src/CMake/uLibCommon.cmake -src/utils/make_recipe/src/CMake/uLibConfigHeader.cmake -src/utils/make_recipe/src/CMake/uLibDebugMacro.cmake -src/utils/make_recipe/src/CMake/uLibFindDependencies.cmake -src/utils/make_recipe/src/CMake/uLibGenerateRMake.cmake -src/utils/make_recipe/src/CMake/uLibMacros.cmake -src/utils/make_recipe/src/CMake/uLibTargetMacros.cmake -src/utils/make_recipe/src/CMakeLists.txt -src/utils/make_recipe/src/main.cpp -src/utils/make_recipe/CMakeLists.txt -src/utils/make_recipe/main.cpp -src/utils/moc/Makefile -src/utils/moc/moc_actions.h -src/utils/moc/parse.y -src/utils/moc/sample.cpp -src/utils/moc/scan.l +src/Root/testing/CMakeLists.txt +src/Root/testing/RootDebugTest.cpp +src/Vtk/CMakeLists.txt +src/Vtk/Vtk.am src/Vtk/testing/CMakeLists.txt -src/Vtk/testing/Makefile.am -src/Vtk/testing/testing-prototype.h src/Vtk/testing/testVtkWriter.cpp +src/Vtk/testing/testing-prototype.h src/Vtk/testing/vtkContainerBoxTest.cpp src/Vtk/testing/vtkMuonScatter.cpp src/Vtk/testing/vtkStructuredGridTest.cpp @@ -481,13 +237,10 @@ src/Vtk/testing/vtkTriangleMeshTest.cpp src/Vtk/testing/vtkViewerTest.cpp src/Vtk/testing/vtkVoxImageTest.cpp src/Vtk/testing/vtkVoxRaytracerTest.cpp -src/Vtk/CMakeLists.txt -src/Vtk/Makefile.am src/Vtk/uLibVtkInterface.cxx src/Vtk/uLibVtkInterface.h src/Vtk/uLibVtkViewer.cpp src/Vtk/uLibVtkViewer.h -src/Vtk/Vtk.am src/Vtk/vtkContainerBox.cpp src/Vtk/vtkContainerBox.h src/Vtk/vtkHLineRepresentation.h @@ -502,32 +255,88 @@ src/Vtk/vtkStructuredGrid.cpp src/Vtk/vtkStructuredGrid.h src/Vtk/vtkTriangleMesh.cpp src/Vtk/vtkTriangleMesh.h -src/Vtk/vtkuLibProp.h src/Vtk/vtkVoxImage.cpp src/Vtk/vtkVoxImage.h src/Vtk/vtkVoxRaytracerRepresentation.cpp src/Vtk/vtkVoxRaytracerRepresentation.h +src/Vtk/vtkuLibProp.h src/cwchar.h -src/Makefile.am +src/ltk/CMakeLists.txt +src/ltk/DenseMatrix.h +src/ltk/Object.c +src/ltk/Object.h +src/ltk/Vector.h +src/ltk/container.h +src/ltk/ltk.h +src/ltk/ltk_bridge/ltkb.c +src/ltk/ltk_bridge/ltkb_test.c +src/ltk/ltk_bridge/setup.sh +src/ltk/ltkdebug.c +src/ltk/ltkdebug.h +src/ltk/ltkmacros.h +src/ltk/ltktypes.h +src/ltk/main.C +src/ltk/main.c +src/ltk/templates.c +src/ltk/templates.h +src/ltk/test_comma.h +src/ltk/testing/Object-cc.cpp +src/ltk/testing/Object.c +src/ltk/testing/Vector-cc.cpp +src/ltk/testing/Vector.c +src/ltk/testing/testing-prototype.h +src/utils/copyrights/cr_update.py +src/utils/copyrights/newcr.txt +src/utils/copyrights/oldcr.txt +src/utils/make_recipe/CMakeLists.txt +src/utils/make_recipe/main.cpp +src/utils/make_recipe/src/CMake/FindEigen3.cmake +src/utils/make_recipe/src/CMake/FindGEANT4.cmake +src/utils/make_recipe/src/CMake/FindGEANT4VMC.cmake +src/utils/make_recipe/src/CMake/FindROOT.cmake +src/utils/make_recipe/src/CMake/FindROOTv6.cmake +src/utils/make_recipe/src/CMake/FindReadLine.cmake +src/utils/make_recipe/src/CMake/FindVTK.cmake +src/utils/make_recipe/src/CMake/FinduLib.cmake +src/utils/make_recipe/src/CMake/clean-all.cmake +src/utils/make_recipe/src/CMake/rmake.in +src/utils/make_recipe/src/CMake/uLibCommon.cmake +src/utils/make_recipe/src/CMake/uLibConfigHeader.cmake +src/utils/make_recipe/src/CMake/uLibDebugMacro.cmake +src/utils/make_recipe/src/CMake/uLibFindDependencies.cmake +src/utils/make_recipe/src/CMake/uLibGenerateRMake.cmake +src/utils/make_recipe/src/CMake/uLibMacros.cmake +src/utils/make_recipe/src/CMake/uLibTargetMacros.cmake +src/utils/make_recipe/src/CMakeLists.txt +src/utils/make_recipe/src/main.cpp +src/utils/moc/moc_actions.h +src/utils/moc/parse.y +src/utils/moc/sample.cpp +src/utils/moc/scan.l +test.cpp tmp/BuildTruck/BuildTruck.cpp -tmp/BuildTruck/Makefile.am -tmp/c_vtable/main.c +tmp/BuildTruck/objects/acciaio1.stl +tmp/BuildTruck/objects/acciaio2.stl +tmp/BuildTruck/objects/carrozzeria.stl +tmp/BuildTruck/objects/container.stl +tmp/BuildTruck/objects/fusto.stl +tmp/BuildTruck/objects/gomma.stl +tmp/BuildTruck/objects/maniglieria.stl +tmp/BuildTruck/objects/telaio.stl +tmp/BuildTruck/objects/truck.blend +tmp/BuildTruck/objects/truck.blend1 +tmp/BuildTruck/objects/truck.blend2 +tmp/BuildTruck/objects/truck1.blend +tmp/BuildTruck/objects/truck1.blend1 +tmp/BuildTruck/objects/truck1r.blend +tmp/BuildTruck/objects/vetro.stl tmp/c_vtable/Object.c tmp/c_vtable/Object.h +tmp/c_vtable/Project.ede tmp/c_vtable/Vector.c tmp/c_vtable/Vector.h -CMakeConfig.in.h -CMakeLists.txt -CMakePkgConfig.pc.in -Common.am -configure.ac -libmutom-0.2.pc.in -Makefile.am -test.cpp -ulib.h +tmp/c_vtable/main.c uLibConfig.cmake.in uLibConfigVersion.cmake.in +ulib.h vtk_test.cpp -src/Core/testing/ClassCompoundTest2.cpp -src/Core/ClassComposite.h -src/Core/testing/ClassCompositeTest.cpp diff --git a/uLib.includes b/uLib.includes index c81da07..cbaf33a 100644 --- a/uLib.includes +++ b/uLib.includes @@ -19,3 +19,6 @@ src/utils/moc src/Vtk src/Vtk/testing tmp/c_vtable + + +/usr/include/root diff --git a/vtk_test.cpp b/vtk_test.cpp index f896a3a..33371ba 100644 --- a/vtk_test.cpp +++ b/vtk_test.cpp @@ -17,10 +17,10 @@ int main() { uLib::MuonScatter event; - event.LineIn().origin << 0,0,0,1; - event.LineIn().direction << 1,1,1,0; - event.LineOut().origin << 5,5,5,1; - event.LineOut().direction << -1,-1,-1,0; + event.LineIn().origin() << 0,0,0,1; + event.LineIn().direction() << 1,1,1,0; + event.LineOut().origin() << 5,5,5,1; + event.LineOut().direction() << -1,-1,-1,0; uLib::Vtk::vtkMuonScatter ms(event);