diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h index e549bc7c55ab2e2d0bbaa73a0671845b87a2813e..f3d55fe548e556760aeffed5f53905e79d77ac96 100644 --- a/DDCore/include/DD4hep/config.h +++ b/DDCore/include/DD4hep/config.h @@ -42,6 +42,10 @@ #define DECREMENT_COUNTER #endif +#if defined(G__ROOT) || defined(__CLING__) || defined(__ROOTCLING__) +#define DD4HEP_INTERPRETER_MODE 1 +#endif + /// Namespace for the AIDA detector description toolkit namespace dd4hep { diff --git a/DDCore/src/AlignmentsPrinter.cpp b/DDCore/src/AlignmentsPrinter.cpp index eb64e476260a1f591db6b886f9f1046b9b429376..49e0139e8f413686092f8dce72a519712f3a0901 100644 --- a/DDCore/src/AlignmentsPrinter.cpp +++ b/DDCore/src/AlignmentsPrinter.cpp @@ -149,21 +149,23 @@ void dd4hep::align::printAlignment(PrintLevel lvl, const string& prefix, } if ( align_delta.hasTranslation() ) { stringstream str; - Parsers::toStream(align_delta.translation, str); - printout(lvl,tag,"++ %s DELTA Translation: %s", + Position copy(align_delta.translation * (1./dd4hep::cm)); + Parsers::toStream(copy, str); + printout(lvl,tag,"++ %s DELTA Translation: %s [cm]", opt.c_str(), replace_all(str.str(),"\n","").c_str()); } if ( align_delta.hasPivot() ) { stringstream str; - Parsers::toStream(align_delta.pivot, str); + Delta::Pivot copy(align_delta.pivot.Vect() * (1./dd4hep::cm)); + Parsers::toStream(copy, str); string res = replace_all(str.str(),"\n",""); res = "( "+replace_all(res," "," , ")+" )"; - printout(lvl,tag,"++ %s DELTA Pivot: %s", opt.c_str(), res.c_str()); + printout(lvl,tag,"++ %s DELTA Pivot: %s [cm]", opt.c_str(), res.c_str()); } if ( align_delta.hasRotation() ) { stringstream str; Parsers::toStream(align_delta.rotation, str); - printout(lvl,tag,"++ %s DELTA Rotation: %s", opt.c_str(), replace_all(str.str(),"\n","").c_str()); + printout(lvl,tag,"++ %s DELTA Rotation: %s [rad]", opt.c_str(), replace_all(str.str(),"\n","").c_str()); } if ( isActivePrintLevel(lvl) ) { printf("%s %s WorldTrafo (to %s): ",opt.c_str(), tag.c_str(), de.world().path().c_str()); diff --git a/DDCore/src/ConditionsPrinter.cpp b/DDCore/src/ConditionsPrinter.cpp index 595a38c963af2dd733f553e0dfda180822ff40c2..2d0552723a1a06e6ce4068d800d75ea82e5d4d52 100644 --- a/DDCore/src/ConditionsPrinter.cpp +++ b/DDCore/src/ConditionsPrinter.cpp @@ -179,17 +179,23 @@ int ConditionsPrinter::operator()(Condition cond) const { string piv; stringstream str_tr, str_rot, str_piv; const Delta& D = cond.get<Delta>(); - if ( D.hasTranslation() ) Parsers::toStream(D.translation, str_tr); - if ( D.hasRotation() ) Parsers::toStream(D.rotation, str_rot); - if ( D.hasPivot() ) { - Parsers::toStream(D.pivot, str_piv); + if ( D.hasTranslation() ) { + Position copy(D.translation * (1./dd4hep::cm)); + Parsers::toStream(copy, str_tr); + } + if ( D.hasRotation() ) { + Parsers::toStream(D.rotation, str_rot); + } + if ( D.hasPivot() ) { + Position copy(D.pivot.Vect() * (1./dd4hep::cm)); + Parsers::toStream(copy, str_piv); piv = str_replace(str_piv.str(),"\n",""); piv = str_replace(piv," "," , "); } printout(printLevel,name,"++ %s \t[%p] Typ:%s", prefix.c_str(), cond.ptr(), typeName(typeid(*ptr)).c_str()); - printout(printLevel,name,"++ %s \tData(%11s-%8s-%5s): [%s, %s, %s]", + printout(printLevel,name,"++ %s \tData(%11s-%8s-%5s): [%s [cm], %s [rad], %s [cm]]", prefix.c_str(), D.hasTranslation() ? "Translation" : "", D.hasRotation() ? "Rotation(Phi,Theta,Psi)" : "", diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp index fd7442b197efc3b52ee5e1668bf37c984aeca17a..a1706c9ee97af5fc362b946fd0f6d534a616b162 100644 --- a/DDCore/src/DetectorImp.cpp +++ b/DDCore/src/DetectorImp.cpp @@ -169,7 +169,11 @@ DetectorImp::DetectorImp(const string& name) first = false; #if defined(DD4HEP_USE_GEANT4_UNITS) && ROOT_VERSION_CODE >= ROOT_VERSION(6,20,0) printout(WARNING,"DD4hep","++ Using globally Geant4 unit system (mm,ns,MeV)"); + TGeoManager::SetDefaultG4Units(); TGeoUnit::setUnitType(TGeoUnit::kTGeant4Units); +#elif ROOT_VERSION_CODE >= ROOT_VERSION(6,20,0) + TGeoManager::SetDefaultRootUnits(); + TGeoUnit::setUnitType(TGeoUnit::kTGeoUnits); #endif } SetName(name.c_str()); diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp index 357be98ffa78a03480da425449d07e4eff9cc9e6..93e4c00234edac470398105508622a6b049cce13 100644 --- a/DDCore/src/Volumes.cpp +++ b/DDCore/src/Volumes.cpp @@ -1006,7 +1006,13 @@ std::string dd4hep::toStringMesh(PlacedVolume place, int prec) { TGeoMatrix* mat = place->GetMatrix(); Solid sol = vol.solid(); stringstream os; - + struct _numbering { + double adjust(double value) const { + if ( std::abs(value) < TGeoShape::Tolerance() ) + return 0.0; + return value/dd4hep::cm; + } + } _vertex; if ( vol->IsA() == TGeoVolumeAssembly::Class() ) { for(int i=0; i<vol->GetNdaughters(); ++i) { @@ -1032,24 +1038,24 @@ std::string dd4hep::toStringMesh(PlacedVolume place, int prec) { Double_t global[3], local[3] = {p[0], p[1], p[2]}; mat->LocalToMaster(local, global); os << setw(16) << left << sol->IsA()->GetName() << " " << setw(3) << left << i - << " Local (" << setw(7) << setprecision(prec) << fixed << right << local[0]/dd4hep::cm - << ", " << setw(7) << setprecision(prec) << fixed << right << local[1]/dd4hep::cm - << ", " << setw(7) << setprecision(prec) << fixed << right << local[2]/dd4hep::cm - << ") Global (" << setw(7) << setprecision(prec) << fixed << right << global[0]/dd4hep::cm - << ", " << setw(7) << setprecision(prec) << fixed << right << global[1]/dd4hep::cm - << ", " << setw(7) << setprecision(prec) << fixed << right << global[2]/dd4hep::cm + << " Local (" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(local[0]) + << ", " << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(local[1]) + << ", " << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(local[2]) + << ") Global (" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(global[0]) + << ", " << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(global[1]) + << ", " << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(global[2]) << ")" << endl; } Box box = sol; const Double_t* org = box->GetOrigin(); os << setw(16) << left << sol->IsA()->GetName() << " Bounding box: " - << " dx=" << setw(7) << setprecision(prec) << fixed << right << box->GetDX()/dd4hep::cm - << " dy=" << setw(7) << setprecision(prec) << fixed << right << box->GetDY()/dd4hep::cm - << " dz=" << setw(7) << setprecision(prec) << fixed << right << box->GetDZ()/dd4hep::cm - << " Origin: x=" << setw(7) << setprecision(prec) << fixed << right << org[0]/dd4hep::cm - << " y=" << setw(7) << setprecision(prec) << fixed << right << org[1]/dd4hep::cm - << " z=" << setw(7) << setprecision(prec) << fixed << right << org[2]/dd4hep::cm + << " dx=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(box->GetDX()) + << " dy=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(box->GetDY()) + << " dz=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(box->GetDZ()) + << " Origin: x=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(org[0]) + << " y=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(org[1]) + << " z=" << setw(7) << setprecision(prec) << fixed << right << _vertex.adjust(org[2]) << endl; /// -------------------- DONE -------------------- diff --git a/DDDigi/include/DDDigi/DigiActionSequence.h b/DDDigi/include/DDDigi/DigiActionSequence.h index 431d3d0488fb4a5c7db33381d4618b7b8095a865..fed3b8bbf16d6b17596ea46bb9b1eddffe6e85bc 100644 --- a/DDDigi/include/DDDigi/DigiActionSequence.h +++ b/DDDigi/include/DDDigi/DigiActionSequence.h @@ -57,7 +57,7 @@ namespace dd4hep { /// Default destructor virtual ~DigiActionSequence(); /// Adopt a new action as part of the sequence. Sequence takes ownership. - void adopt(DigiEventAction* action); + virtual void adopt(DigiEventAction* action) override; /// Register external listener callbacks before starting the sequence template <typename Q, typename T> void begin(Q* p, void (T::*f)(DigiContext* context)) { diff --git a/DDDigi/include/DDDigi/DigiData.h b/DDDigi/include/DDDigi/DigiData.h index 7bd820579318136a523eab3849954dd910e6d2ca..d56781aca62634473bb6a869e63174094d85562f 100644 --- a/DDDigi/include/DDDigi/DigiData.h +++ b/DDDigi/include/DDDigi/DigiData.h @@ -14,7 +14,7 @@ #define DDDIGI_DIGIDATA_H /// Framework include files -#include "DD4hep/Any.h" +#include "DD4hep/config.h" #include "DD4hep/Objects.h" #include "DD4hep/Printout.h" #include "DD4hep/Primitives.h" @@ -254,7 +254,22 @@ namespace dd4hep { key_type toLong() const { return key; } void set(const std::string& name, int mask); }; + } // End namespace digi +} // End namespace dd4hep + +/// <any> is not properly processed by cling. +/// We need to exclude any reference to it. +#if !defined(DD4HEP_INTERPRETER_MODE) +#include "DD4hep/Any.h" +#endif + +/// Namespace for the AIDA detector description toolkit +namespace dd4hep { + + /// Namespace for the Digitization part of the AIDA detector description toolkit + namespace digi { + /// User event data for DDDigi /** * @@ -270,10 +285,13 @@ namespace dd4hep { std::map<unsigned long, std::shared_ptr<DigiCounts> > digitizations; int eventNumber = 0; +#if defined(DD4HEP_INTERPRETER_MODE) + std::map<key_type, long> data; +#else std::map<key_type, dd4hep::any> data; - +#endif public: -#if defined(G__ROOT) || defined(__CLING__) || defined(__ROOTCLING__) +#if defined(DD4HEP_INTERPRETER_MODE) || defined(G__ROOT) /// Inhibit default constructor DigiEvent(); #endif @@ -285,6 +303,8 @@ namespace dd4hep { DigiEvent(int num); /// Default destructor virtual ~DigiEvent(); + +#if !defined(DD4HEP_INTERPRETER_MODE) /// Add item by key to the data template<typename T> bool put(const Key& key, T&& object) { bool ret = data.emplace(key.toLong(),make_any<T>(object)).second; @@ -316,7 +336,7 @@ namespace dd4hep { except("DigiEvent","Invalid data requested from event container. Key:%ld",key.toLong()); throw std::runtime_error("DigiEvent"); // Will never get here! } - +#endif /// Add an extension object to the detector element void* addExtension(unsigned long long int k, ExtensionEntry* e) { return ObjectExtensions::addExtension(k, e); diff --git a/DDDigi/include/DDDigi/DigiSynchronize.h b/DDDigi/include/DDDigi/DigiSynchronize.h index 3380136748082c3b51533a6f1d42c3c40c585688..db33a3742a0090f7c70bee45a786854fe9a3fa0b 100644 --- a/DDDigi/include/DDDigi/DigiSynchronize.h +++ b/DDDigi/include/DDDigi/DigiSynchronize.h @@ -52,7 +52,7 @@ namespace dd4hep { return m_actors; } /// Adopt a new action as part of the sequence. Sequence takes ownership. - void adopt(DigiEventAction* action); + virtual void adopt(DigiEventAction* action); /// Begin-of-event callback virtual void execute(DigiContext& context) const override; /// diff --git a/examples/AlignDet/src/AlignmentExample_align_telescope.cpp b/examples/AlignDet/src/AlignmentExample_align_telescope.cpp index 8b593fce05ba5e4a82614905d4f7e582782623dc..60fb012268bb580200ddb04d8fbbd2506dab3486 100644 --- a/examples/AlignDet/src/AlignmentExample_align_telescope.cpp +++ b/examples/AlignDet/src/AlignmentExample_align_telescope.cpp @@ -150,8 +150,8 @@ static int AlignmentExample_align_telescope (Detector& description, int argc, ch } /// Let's change something: - Delta delta(Position(333.0/dd4hep::cm,0,0)); - calib.set(calib.detector("/world/Telescope"),Delta(Position(55.0/dd4hep::cm,0,0))); + Delta delta(Position(333.0*dd4hep::cm,0,0)); + calib.set(calib.detector("/world/Telescope"),Delta(Position(55.0*dd4hep::cm,0,0))); calib.set(calib.detector("/world/Telescope/module_1"),delta); calib.set("/world/Telescope/module_3",delta); /// Commit transaction and push deltas to the alignment conditions diff --git a/examples/ClientTests/compact/CheckShape.xml b/examples/ClientTests/compact/CheckShape.xml index b8bc9b65ca498486d03aa0a1a7baa26fb4080e26..c4218c0c54a45785f0b289fa81111060ceca6ce3 100644 --- a/examples/ClientTests/compact/CheckShape.xml +++ b/examples/ClientTests/compact/CheckShape.xml @@ -32,6 +32,8 @@ <constant name="world_x" value="world_side"/> <constant name="world_y" value="world_side"/> <constant name="world_z" value="world_side"/> + <constant name="unit_length" value="1*10"/> + <constant name="unit_pos" value="unit_length/10"/> <constant name="CheckShape_create" value="0"/> </define> diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml index 62a9b70a803b696b54f568ecfbe998487b79b7d7..d2d6622e514d52aea1cc2a3c778b360069596515 100644 --- a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml +++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml @@ -20,8 +20,8 @@ <detector id="1" name="Shape_PseudoTrap" type="DD4hep_TestShape_Creator"> <!-- Union pseudo-trap: --> <check vis="Shape1_vis"> - <shape type="PseudoTrap" z="30*cm" radius="-40*cm" - x1="33*cm" x2="3*cm" y1="30*cm" y2="10*cm" minusZ="true"/> + <shape type="PseudoTrap" z="30*cm" radius="40*cm" + x1="33*cm" x2="15*cm" y1="30*cm" y2="10*cm" minusZ="true"/> <position x="30*cm" y="30*cm" z="50*cm"/> <rotation x="0*rad" y="0*rad" z="0*rad"/> </check> @@ -42,6 +42,7 @@ </check> --> <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap.txt" create="CheckShape_create"/> + <testn type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap.txt" create="1"/> </detector> </detectors> </lccdd> diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap1.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap1.xml index b3eba9b8ae41d26648f888a04479dc0341932b33..4d8269abbf2c708d4aaf9afaab50e9a4d4ab140a 100644 --- a/examples/ClientTests/compact/Check_Shape_PseudoTrap1.xml +++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap1.xml @@ -23,12 +23,12 @@ <shape type="PseudoTrap" name="YE1_b" x1="0.5*m" x2="1.86356*m" y1="0.3000*m" y2="0.3000*m" - z="0.92934*m" radius="-0.91350*m" minusZ="true"/> + z="0.92934*m" radius="0.91350*m" minusZ="true"/> <position x="0*cm" y="0*cm" z="0*cm"/> <rotation x="0*rad" y="0*rad" z="0*rad"/> </check> - <testn type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap1.txt" create="CheckShape_create"/> - <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap1.txt" create="1"/> + <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap1.txt" create="CheckShape_create"/> + <testn type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap1.txt" create="1"/> </detector> </detectors> </lccdd> diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml index bf798dcdf54880c7b0c6c6106dec168a5d576a4c..8e9635f260e7937ba19d9c81d3e0a06068da4584 100644 --- a/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml +++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml @@ -50,8 +50,8 @@ <position x="0*cm" y="330*cm" z="0*cm"/> <rotation x="pi*rad" y="0*rad" z="0*rad"/> </check> - <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap2.txt" create="CheckShape_create"/> - <testn type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap2.txt" create="1"/> + <test type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap2.txt" create="CheckShape_create"/> + <testn type="DD4hep_Mesh_Verifier" ref="${DD4hepExamplesINSTALL}/examples/ClientTests/ref/Ref_PseudoTrap2.txt" create="1"/> </detector> </detectors> </lccdd> diff --git a/examples/ClientTests/ref/Ref_Cone.txt b/examples/ClientTests/ref/Ref_Cone.txt index 1a80a947c6992e0e4de02da58072be36949c6a54..ebaae3ef00c3ffaf030232748b49599ac759901c 100644 --- a/examples/ClientTests/ref/Ref_Cone.txt +++ b/examples/ClientTests/ref/Ref_Cone.txt @@ -15,7 +15,7 @@ TGeoCone 11 Local ( -9.51, -3.09, -40.00) Global ( 20.49, 26.91 TGeoCone 12 Local ( -8.09, -5.88, -40.00) Global ( 21.91, 24.12, -10.00) TGeoCone 13 Local ( -5.88, -8.09, -40.00) Global ( 24.12, 21.91, -10.00) TGeoCone 14 Local ( -3.09, -9.51, -40.00) Global ( 26.91, 20.49, -10.00) -TGeoCone 15 Local ( -0.00, -10.00, -40.00) Global ( 30.00, 20.00, -10.00) +TGeoCone 15 Local ( 0.00, -10.00, -40.00) Global ( 30.00, 20.00, -10.00) TGeoCone 16 Local ( 3.09, -9.51, -40.00) Global ( 33.09, 20.49, -10.00) TGeoCone 17 Local ( 5.88, -8.09, -40.00) Global ( 35.88, 21.91, -10.00) TGeoCone 18 Local ( 8.09, -5.88, -40.00) Global ( 38.09, 24.12, -10.00) @@ -35,7 +35,7 @@ TGeoCone 31 Local ( -28.53, -9.27, -40.00) Global ( 1.47, 20.73 TGeoCone 32 Local ( -24.27, -17.63, -40.00) Global ( 5.73, 12.37, -10.00) TGeoCone 33 Local ( -17.63, -24.27, -40.00) Global ( 12.37, 5.73, -10.00) TGeoCone 34 Local ( -9.27, -28.53, -40.00) Global ( 20.73, 1.47, -10.00) -TGeoCone 35 Local ( -0.00, -30.00, -40.00) Global ( 30.00, 0.00, -10.00) +TGeoCone 35 Local ( 0.00, -30.00, -40.00) Global ( 30.00, 0.00, -10.00) TGeoCone 36 Local ( 9.27, -28.53, -40.00) Global ( 39.27, 1.47, -10.00) TGeoCone 37 Local ( 17.63, -24.27, -40.00) Global ( 47.63, 5.73, -10.00) TGeoCone 38 Local ( 24.27, -17.63, -40.00) Global ( 54.27, 12.37, -10.00) @@ -55,7 +55,7 @@ TGeoCone 51 Local ( -47.55, -15.45, 40.00) Global ( -17.55, 14.55 TGeoCone 52 Local ( -40.45, -29.39, 40.00) Global ( -10.45, 0.61, 70.00) TGeoCone 53 Local ( -29.39, -40.45, 40.00) Global ( 0.61, -10.45, 70.00) TGeoCone 54 Local ( -15.45, -47.55, 40.00) Global ( 14.55, -17.55, 70.00) -TGeoCone 55 Local ( -0.00, -50.00, 40.00) Global ( 30.00, -20.00, 70.00) +TGeoCone 55 Local ( 0.00, -50.00, 40.00) Global ( 30.00, -20.00, 70.00) TGeoCone 56 Local ( 15.45, -47.55, 40.00) Global ( 45.45, -17.55, 70.00) TGeoCone 57 Local ( 29.39, -40.45, 40.00) Global ( 59.39, -10.45, 70.00) TGeoCone 58 Local ( 40.45, -29.39, 40.00) Global ( 70.45, 0.61, 70.00) @@ -75,7 +75,7 @@ TGeoCone 71 Local ( -57.06, -18.54, 40.00) Global ( -27.06, 11.46 TGeoCone 72 Local ( -48.54, -35.27, 40.00) Global ( -18.54, -5.27, 70.00) TGeoCone 73 Local ( -35.27, -48.54, 40.00) Global ( -5.27, -18.54, 70.00) TGeoCone 74 Local ( -18.54, -57.06, 40.00) Global ( 11.46, -27.06, 70.00) -TGeoCone 75 Local ( -0.00, -60.00, 40.00) Global ( 30.00, -30.00, 70.00) +TGeoCone 75 Local ( 0.00, -60.00, 40.00) Global ( 30.00, -30.00, 70.00) TGeoCone 76 Local ( 18.54, -57.06, 40.00) Global ( 48.54, -27.06, 70.00) TGeoCone 77 Local ( 35.27, -48.54, 40.00) Global ( 65.27, -18.54, 70.00) TGeoCone 78 Local ( 48.54, -35.27, 40.00) Global ( 78.54, -5.27, 70.00) diff --git a/examples/ClientTests/ref/Ref_Eightpoint_Reflect_DetElement.txt b/examples/ClientTests/ref/Ref_Eightpoint_Reflect_DetElement.txt index 54d1dc479047a7f343b8485fb22de5a3be555564..2bdc61a88c53d02910f2aea21e3b4ed2d8b20024 100644 --- a/examples/ClientTests/ref/Ref_Eightpoint_Reflect_DetElement.txt +++ b/examples/ClientTests/ref/Ref_Eightpoint_Reflect_DetElement.txt @@ -20,5 +20,5 @@ TGeoScaledShape 4 Local ( -28.00, -23.00, -30.00) Global ( -28.00, -23.00 TGeoScaledShape 5 Local ( -23.00, 27.00, -30.00) Global ( -23.00, 27.00, -130.00) TGeoScaledShape 6 Local ( -23.00, 27.00, -30.00) Global ( -23.00, 27.00, -130.00) TGeoScaledShape 7 Local ( 13.00, -27.00, -30.00) Global ( 13.00, -27.00, -130.00) -TGeoScaledShape Bounding box: dx= 27.50 dy= 27.00 dz= 30.00 Origin: x= -2.50 y= 0.00 z= -0.00 +TGeoScaledShape Bounding box: dx= 27.50 dy= 27.00 dz= 30.00 Origin: x= -2.50 y= 0.00 z= 0.00 diff --git a/examples/ClientTests/ref/Ref_ElTube.txt b/examples/ClientTests/ref/Ref_ElTube.txt index 9e5e44d7217c9132a3c5066c987908fc08b8cff7..2208770fad3e3e2905c91fecd1f6a854c2c6110f 100644 --- a/examples/ClientTests/ref/Ref_ElTube.txt +++ b/examples/ClientTests/ref/Ref_ElTube.txt @@ -35,7 +35,7 @@ TGeoEltu 31 Local ( -9.94, -3.23, -50.00) Global ( 20.06, 26.77 TGeoEltu 32 Local ( -9.72, -7.06, -50.00) Global ( 20.28, 22.94, 0.00) TGeoEltu 33 Local ( -9.09, -12.51, -50.00) Global ( 20.91, 17.49, 0.00) TGeoEltu 34 Local ( -6.98, -21.48, -50.00) Global ( 23.02, 8.52, 0.00) -TGeoEltu 35 Local ( -0.00, -30.00, -50.00) Global ( 30.00, 0.00, 0.00) +TGeoEltu 35 Local ( 0.00, -30.00, -50.00) Global ( 30.00, 0.00, 0.00) TGeoEltu 36 Local ( 6.98, -21.48, -50.00) Global ( 36.98, 8.52, 0.00) TGeoEltu 37 Local ( 9.09, -12.51, -50.00) Global ( 39.09, 17.49, 0.00) TGeoEltu 38 Local ( 9.72, -7.06, -50.00) Global ( 39.72, 22.94, 0.00) @@ -75,7 +75,7 @@ TGeoEltu 71 Local ( -9.94, -3.23, 50.00) Global ( 20.06, 26.77 TGeoEltu 72 Local ( -9.72, -7.06, 50.00) Global ( 20.28, 22.94, 100.00) TGeoEltu 73 Local ( -9.09, -12.51, 50.00) Global ( 20.91, 17.49, 100.00) TGeoEltu 74 Local ( -6.98, -21.48, 50.00) Global ( 23.02, 8.52, 100.00) -TGeoEltu 75 Local ( -0.00, -30.00, 50.00) Global ( 30.00, 0.00, 100.00) +TGeoEltu 75 Local ( 0.00, -30.00, 50.00) Global ( 30.00, 0.00, 100.00) TGeoEltu 76 Local ( 6.98, -21.48, 50.00) Global ( 36.98, 8.52, 100.00) TGeoEltu 77 Local ( 9.09, -12.51, 50.00) Global ( 39.09, 17.49, 100.00) TGeoEltu 78 Local ( 9.72, -7.06, 50.00) Global ( 39.72, 22.94, 100.00) diff --git a/examples/ClientTests/ref/Ref_Hyperboloid.txt b/examples/ClientTests/ref/Ref_Hyperboloid.txt index 9cbbff62ae6528ab4f28d047dd8889067592465d..3300a59abe6275d14bdc974c52523656b182148a 100644 --- a/examples/ClientTests/ref/Ref_Hyperboloid.txt +++ b/examples/ClientTests/ref/Ref_Hyperboloid.txt @@ -15,7 +15,7 @@ TGeoHype 11 Local ( -35.83, -11.64, -50.00) Global ( -5.83, 18.36 TGeoHype 12 Local ( -30.48, -22.15, -50.00) Global ( -0.48, 7.85, -20.00) TGeoHype 13 Local ( -22.15, -30.48, -50.00) Global ( 7.85, -0.48, -20.00) TGeoHype 14 Local ( -11.64, -35.83, -50.00) Global ( 18.36, -5.83, -20.00) -TGeoHype 15 Local ( -0.00, -37.68, -50.00) Global ( 30.00, -7.68, -20.00) +TGeoHype 15 Local ( 0.00, -37.68, -50.00) Global ( 30.00, -7.68, -20.00) TGeoHype 16 Local ( 11.64, -35.83, -50.00) Global ( 41.64, -5.83, -20.00) TGeoHype 17 Local ( 22.15, -30.48, -50.00) Global ( 52.15, -0.48, -20.00) TGeoHype 18 Local ( 30.48, -22.15, -50.00) Global ( 60.48, 7.85, -20.00) @@ -35,7 +35,7 @@ TGeoHype 31 Local ( -32.34, -10.51, -44.74) Global ( -2.34, 19.49 TGeoHype 32 Local ( -27.51, -19.99, -44.74) Global ( 2.49, 10.01, -14.74) TGeoHype 33 Local ( -19.99, -27.51, -44.74) Global ( 10.01, 2.49, -14.74) TGeoHype 34 Local ( -10.51, -32.34, -44.74) Global ( 19.49, -2.34, -14.74) -TGeoHype 35 Local ( -0.00, -34.01, -44.74) Global ( 30.00, -4.01, -14.74) +TGeoHype 35 Local ( 0.00, -34.01, -44.74) Global ( 30.00, -4.01, -14.74) TGeoHype 36 Local ( 10.51, -32.34, -44.74) Global ( 40.51, -2.34, -14.74) TGeoHype 37 Local ( 19.99, -27.51, -44.74) Global ( 49.99, 2.49, -14.74) TGeoHype 38 Local ( 27.51, -19.99, -44.74) Global ( 57.51, 10.01, -14.74) @@ -55,7 +55,7 @@ TGeoHype 51 Local ( -28.89, -9.39, -39.47) Global ( 1.11, 20.61 TGeoHype 52 Local ( -24.57, -17.85, -39.47) Global ( 5.43, 12.15, -9.47) TGeoHype 53 Local ( -17.85, -24.57, -39.47) Global ( 12.15, 5.43, -9.47) TGeoHype 54 Local ( -9.39, -28.89, -39.47) Global ( 20.61, 1.11, -9.47) -TGeoHype 55 Local ( -0.00, -30.37, -39.47) Global ( 30.00, -0.37, -9.47) +TGeoHype 55 Local ( 0.00, -30.37, -39.47) Global ( 30.00, -0.37, -9.47) TGeoHype 56 Local ( 9.39, -28.89, -39.47) Global ( 39.39, 1.11, -9.47) TGeoHype 57 Local ( 17.85, -24.57, -39.47) Global ( 47.85, 5.43, -9.47) TGeoHype 58 Local ( 24.57, -17.85, -39.47) Global ( 54.57, 12.15, -9.47) @@ -75,7 +75,7 @@ TGeoHype 71 Local ( -25.48, -8.28, -34.21) Global ( 4.52, 21.72 TGeoHype 72 Local ( -21.67, -15.75, -34.21) Global ( 8.33, 14.25, -4.21) TGeoHype 73 Local ( -15.75, -21.67, -34.21) Global ( 14.25, 8.33, -4.21) TGeoHype 74 Local ( -8.28, -25.48, -34.21) Global ( 21.72, 4.52, -4.21) -TGeoHype 75 Local ( -0.00, -26.79, -34.21) Global ( 30.00, 3.21, -4.21) +TGeoHype 75 Local ( 0.00, -26.79, -34.21) Global ( 30.00, 3.21, -4.21) TGeoHype 76 Local ( 8.28, -25.48, -34.21) Global ( 38.28, 4.52, -4.21) TGeoHype 77 Local ( 15.75, -21.67, -34.21) Global ( 45.75, 8.33, -4.21) TGeoHype 78 Local ( 21.67, -15.75, -34.21) Global ( 51.67, 14.25, -4.21) @@ -95,7 +95,7 @@ TGeoHype 91 Local ( -22.15, -7.20, -28.95) Global ( 7.85, 22.80 TGeoHype 92 Local ( -18.84, -13.69, -28.95) Global ( 11.16, 16.31, 1.05) TGeoHype 93 Local ( -13.69, -18.84, -28.95) Global ( 16.31, 11.16, 1.05) TGeoHype 94 Local ( -7.20, -22.15, -28.95) Global ( 22.80, 7.85, 1.05) -TGeoHype 95 Local ( -0.00, -23.29, -28.95) Global ( 30.00, 6.71, 1.05) +TGeoHype 95 Local ( 0.00, -23.29, -28.95) Global ( 30.00, 6.71, 1.05) TGeoHype 96 Local ( 7.20, -22.15, -28.95) Global ( 37.20, 7.85, 1.05) TGeoHype 97 Local ( 13.69, -18.84, -28.95) Global ( 43.69, 11.16, 1.05) TGeoHype 98 Local ( 18.84, -13.69, -28.95) Global ( 48.84, 16.31, 1.05) @@ -115,7 +115,7 @@ TGeoHype 111 Local ( -18.93, -6.15, -23.68) Global ( 11.07, 23.85 TGeoHype 112 Local ( -16.10, -11.70, -23.68) Global ( 13.90, 18.30, 6.32) TGeoHype 113 Local ( -11.70, -16.10, -23.68) Global ( 18.30, 13.90, 6.32) TGeoHype 114 Local ( -6.15, -18.93, -23.68) Global ( 23.85, 11.07, 6.32) -TGeoHype 115 Local ( -0.00, -19.90, -23.68) Global ( 30.00, 10.10, 6.32) +TGeoHype 115 Local ( 0.00, -19.90, -23.68) Global ( 30.00, 10.10, 6.32) TGeoHype 116 Local ( 6.15, -18.93, -23.68) Global ( 36.15, 11.07, 6.32) TGeoHype 117 Local ( 11.70, -16.10, -23.68) Global ( 41.70, 13.90, 6.32) TGeoHype 118 Local ( 16.10, -11.70, -23.68) Global ( 46.10, 18.30, 6.32) @@ -135,7 +135,7 @@ TGeoHype 131 Local ( -15.89, -5.16, -18.42) Global ( 14.11, 24.84 TGeoHype 132 Local ( -13.52, -9.82, -18.42) Global ( 16.48, 20.18, 11.58) TGeoHype 133 Local ( -9.82, -13.52, -18.42) Global ( 20.18, 16.48, 11.58) TGeoHype 134 Local ( -5.16, -15.89, -18.42) Global ( 24.84, 14.11, 11.58) -TGeoHype 135 Local ( -0.00, -16.71, -18.42) Global ( 30.00, 13.29, 11.58) +TGeoHype 135 Local ( 0.00, -16.71, -18.42) Global ( 30.00, 13.29, 11.58) TGeoHype 136 Local ( 5.16, -15.89, -18.42) Global ( 35.16, 14.11, 11.58) TGeoHype 137 Local ( 9.82, -13.52, -18.42) Global ( 39.82, 16.48, 11.58) TGeoHype 138 Local ( 13.52, -9.82, -18.42) Global ( 43.52, 20.18, 11.58) @@ -155,7 +155,7 @@ TGeoHype 151 Local ( -13.16, -4.28, -13.16) Global ( 16.84, 25.72 TGeoHype 152 Local ( -11.19, -8.13, -13.16) Global ( 18.81, 21.87, 16.84) TGeoHype 153 Local ( -8.13, -11.19, -13.16) Global ( 21.87, 18.81, 16.84) TGeoHype 154 Local ( -4.28, -13.16, -13.16) Global ( 25.72, 16.84, 16.84) -TGeoHype 155 Local ( -0.00, -13.83, -13.16) Global ( 30.00, 16.17, 16.84) +TGeoHype 155 Local ( 0.00, -13.83, -13.16) Global ( 30.00, 16.17, 16.84) TGeoHype 156 Local ( 4.28, -13.16, -13.16) Global ( 34.28, 16.84, 16.84) TGeoHype 157 Local ( 8.13, -11.19, -13.16) Global ( 38.13, 18.81, 16.84) TGeoHype 158 Local ( 11.19, -8.13, -13.16) Global ( 41.19, 21.87, 16.84) @@ -175,7 +175,7 @@ TGeoHype 171 Local ( -10.96, -3.56, -7.89) Global ( 19.04, 26.44 TGeoHype 172 Local ( -9.33, -6.78, -7.89) Global ( 20.67, 23.22, 22.11) TGeoHype 173 Local ( -6.78, -9.33, -7.89) Global ( 23.22, 20.67, 22.11) TGeoHype 174 Local ( -3.56, -10.96, -7.89) Global ( 26.44, 19.04, 22.11) -TGeoHype 175 Local ( -0.00, -11.53, -7.89) Global ( 30.00, 18.47, 22.11) +TGeoHype 175 Local ( 0.00, -11.53, -7.89) Global ( 30.00, 18.47, 22.11) TGeoHype 176 Local ( 3.56, -10.96, -7.89) Global ( 33.56, 19.04, 22.11) TGeoHype 177 Local ( 6.78, -9.33, -7.89) Global ( 36.78, 20.67, 22.11) TGeoHype 178 Local ( 9.33, -6.78, -7.89) Global ( 39.33, 23.22, 22.11) @@ -195,7 +195,7 @@ TGeoHype 191 Local ( -9.68, -3.15, -2.63) Global ( 20.32, 26.85 TGeoHype 192 Local ( -8.24, -5.98, -2.63) Global ( 21.76, 24.02, 27.37) TGeoHype 193 Local ( -5.98, -8.24, -2.63) Global ( 24.02, 21.76, 27.37) TGeoHype 194 Local ( -3.15, -9.68, -2.63) Global ( 26.85, 20.32, 27.37) -TGeoHype 195 Local ( -0.00, -10.18, -2.63) Global ( 30.00, 19.82, 27.37) +TGeoHype 195 Local ( 0.00, -10.18, -2.63) Global ( 30.00, 19.82, 27.37) TGeoHype 196 Local ( 3.15, -9.68, -2.63) Global ( 33.15, 20.32, 27.37) TGeoHype 197 Local ( 5.98, -8.24, -2.63) Global ( 35.98, 21.76, 27.37) TGeoHype 198 Local ( 8.24, -5.98, -2.63) Global ( 38.24, 24.02, 27.37) @@ -215,7 +215,7 @@ TGeoHype 211 Local ( -9.68, -3.15, 2.63) Global ( 20.32, 26.85 TGeoHype 212 Local ( -8.24, -5.98, 2.63) Global ( 21.76, 24.02, 32.63) TGeoHype 213 Local ( -5.98, -8.24, 2.63) Global ( 24.02, 21.76, 32.63) TGeoHype 214 Local ( -3.15, -9.68, 2.63) Global ( 26.85, 20.32, 32.63) -TGeoHype 215 Local ( -0.00, -10.18, 2.63) Global ( 30.00, 19.82, 32.63) +TGeoHype 215 Local ( 0.00, -10.18, 2.63) Global ( 30.00, 19.82, 32.63) TGeoHype 216 Local ( 3.15, -9.68, 2.63) Global ( 33.15, 20.32, 32.63) TGeoHype 217 Local ( 5.98, -8.24, 2.63) Global ( 35.98, 21.76, 32.63) TGeoHype 218 Local ( 8.24, -5.98, 2.63) Global ( 38.24, 24.02, 32.63) @@ -235,7 +235,7 @@ TGeoHype 231 Local ( -10.96, -3.56, 7.89) Global ( 19.04, 26.44 TGeoHype 232 Local ( -9.33, -6.78, 7.89) Global ( 20.67, 23.22, 37.89) TGeoHype 233 Local ( -6.78, -9.33, 7.89) Global ( 23.22, 20.67, 37.89) TGeoHype 234 Local ( -3.56, -10.96, 7.89) Global ( 26.44, 19.04, 37.89) -TGeoHype 235 Local ( -0.00, -11.53, 7.89) Global ( 30.00, 18.47, 37.89) +TGeoHype 235 Local ( 0.00, -11.53, 7.89) Global ( 30.00, 18.47, 37.89) TGeoHype 236 Local ( 3.56, -10.96, 7.89) Global ( 33.56, 19.04, 37.89) TGeoHype 237 Local ( 6.78, -9.33, 7.89) Global ( 36.78, 20.67, 37.89) TGeoHype 238 Local ( 9.33, -6.78, 7.89) Global ( 39.33, 23.22, 37.89) @@ -255,7 +255,7 @@ TGeoHype 251 Local ( -13.16, -4.28, 13.16) Global ( 16.84, 25.72 TGeoHype 252 Local ( -11.19, -8.13, 13.16) Global ( 18.81, 21.87, 43.16) TGeoHype 253 Local ( -8.13, -11.19, 13.16) Global ( 21.87, 18.81, 43.16) TGeoHype 254 Local ( -4.28, -13.16, 13.16) Global ( 25.72, 16.84, 43.16) -TGeoHype 255 Local ( -0.00, -13.83, 13.16) Global ( 30.00, 16.17, 43.16) +TGeoHype 255 Local ( 0.00, -13.83, 13.16) Global ( 30.00, 16.17, 43.16) TGeoHype 256 Local ( 4.28, -13.16, 13.16) Global ( 34.28, 16.84, 43.16) TGeoHype 257 Local ( 8.13, -11.19, 13.16) Global ( 38.13, 18.81, 43.16) TGeoHype 258 Local ( 11.19, -8.13, 13.16) Global ( 41.19, 21.87, 43.16) @@ -275,7 +275,7 @@ TGeoHype 271 Local ( -15.89, -5.16, 18.42) Global ( 14.11, 24.84 TGeoHype 272 Local ( -13.52, -9.82, 18.42) Global ( 16.48, 20.18, 48.42) TGeoHype 273 Local ( -9.82, -13.52, 18.42) Global ( 20.18, 16.48, 48.42) TGeoHype 274 Local ( -5.16, -15.89, 18.42) Global ( 24.84, 14.11, 48.42) -TGeoHype 275 Local ( -0.00, -16.71, 18.42) Global ( 30.00, 13.29, 48.42) +TGeoHype 275 Local ( 0.00, -16.71, 18.42) Global ( 30.00, 13.29, 48.42) TGeoHype 276 Local ( 5.16, -15.89, 18.42) Global ( 35.16, 14.11, 48.42) TGeoHype 277 Local ( 9.82, -13.52, 18.42) Global ( 39.82, 16.48, 48.42) TGeoHype 278 Local ( 13.52, -9.82, 18.42) Global ( 43.52, 20.18, 48.42) @@ -295,7 +295,7 @@ TGeoHype 291 Local ( -18.93, -6.15, 23.68) Global ( 11.07, 23.85 TGeoHype 292 Local ( -16.10, -11.70, 23.68) Global ( 13.90, 18.30, 53.68) TGeoHype 293 Local ( -11.70, -16.10, 23.68) Global ( 18.30, 13.90, 53.68) TGeoHype 294 Local ( -6.15, -18.93, 23.68) Global ( 23.85, 11.07, 53.68) -TGeoHype 295 Local ( -0.00, -19.90, 23.68) Global ( 30.00, 10.10, 53.68) +TGeoHype 295 Local ( 0.00, -19.90, 23.68) Global ( 30.00, 10.10, 53.68) TGeoHype 296 Local ( 6.15, -18.93, 23.68) Global ( 36.15, 11.07, 53.68) TGeoHype 297 Local ( 11.70, -16.10, 23.68) Global ( 41.70, 13.90, 53.68) TGeoHype 298 Local ( 16.10, -11.70, 23.68) Global ( 46.10, 18.30, 53.68) @@ -315,7 +315,7 @@ TGeoHype 311 Local ( -22.15, -7.20, 28.95) Global ( 7.85, 22.80 TGeoHype 312 Local ( -18.84, -13.69, 28.95) Global ( 11.16, 16.31, 58.95) TGeoHype 313 Local ( -13.69, -18.84, 28.95) Global ( 16.31, 11.16, 58.95) TGeoHype 314 Local ( -7.20, -22.15, 28.95) Global ( 22.80, 7.85, 58.95) -TGeoHype 315 Local ( -0.00, -23.29, 28.95) Global ( 30.00, 6.71, 58.95) +TGeoHype 315 Local ( 0.00, -23.29, 28.95) Global ( 30.00, 6.71, 58.95) TGeoHype 316 Local ( 7.20, -22.15, 28.95) Global ( 37.20, 7.85, 58.95) TGeoHype 317 Local ( 13.69, -18.84, 28.95) Global ( 43.69, 11.16, 58.95) TGeoHype 318 Local ( 18.84, -13.69, 28.95) Global ( 48.84, 16.31, 58.95) @@ -335,7 +335,7 @@ TGeoHype 331 Local ( -25.48, -8.28, 34.21) Global ( 4.52, 21.72 TGeoHype 332 Local ( -21.67, -15.75, 34.21) Global ( 8.33, 14.25, 64.21) TGeoHype 333 Local ( -15.75, -21.67, 34.21) Global ( 14.25, 8.33, 64.21) TGeoHype 334 Local ( -8.28, -25.48, 34.21) Global ( 21.72, 4.52, 64.21) -TGeoHype 335 Local ( -0.00, -26.79, 34.21) Global ( 30.00, 3.21, 64.21) +TGeoHype 335 Local ( 0.00, -26.79, 34.21) Global ( 30.00, 3.21, 64.21) TGeoHype 336 Local ( 8.28, -25.48, 34.21) Global ( 38.28, 4.52, 64.21) TGeoHype 337 Local ( 15.75, -21.67, 34.21) Global ( 45.75, 8.33, 64.21) TGeoHype 338 Local ( 21.67, -15.75, 34.21) Global ( 51.67, 14.25, 64.21) @@ -355,7 +355,7 @@ TGeoHype 351 Local ( -28.89, -9.39, 39.47) Global ( 1.11, 20.61 TGeoHype 352 Local ( -24.57, -17.85, 39.47) Global ( 5.43, 12.15, 69.47) TGeoHype 353 Local ( -17.85, -24.57, 39.47) Global ( 12.15, 5.43, 69.47) TGeoHype 354 Local ( -9.39, -28.89, 39.47) Global ( 20.61, 1.11, 69.47) -TGeoHype 355 Local ( -0.00, -30.37, 39.47) Global ( 30.00, -0.37, 69.47) +TGeoHype 355 Local ( 0.00, -30.37, 39.47) Global ( 30.00, -0.37, 69.47) TGeoHype 356 Local ( 9.39, -28.89, 39.47) Global ( 39.39, 1.11, 69.47) TGeoHype 357 Local ( 17.85, -24.57, 39.47) Global ( 47.85, 5.43, 69.47) TGeoHype 358 Local ( 24.57, -17.85, 39.47) Global ( 54.57, 12.15, 69.47) @@ -375,7 +375,7 @@ TGeoHype 371 Local ( -32.34, -10.51, 44.74) Global ( -2.34, 19.49 TGeoHype 372 Local ( -27.51, -19.99, 44.74) Global ( 2.49, 10.01, 74.74) TGeoHype 373 Local ( -19.99, -27.51, 44.74) Global ( 10.01, 2.49, 74.74) TGeoHype 374 Local ( -10.51, -32.34, 44.74) Global ( 19.49, -2.34, 74.74) -TGeoHype 375 Local ( -0.00, -34.01, 44.74) Global ( 30.00, -4.01, 74.74) +TGeoHype 375 Local ( 0.00, -34.01, 44.74) Global ( 30.00, -4.01, 74.74) TGeoHype 376 Local ( 10.51, -32.34, 44.74) Global ( 40.51, -2.34, 74.74) TGeoHype 377 Local ( 19.99, -27.51, 44.74) Global ( 49.99, 2.49, 74.74) TGeoHype 378 Local ( 27.51, -19.99, 44.74) Global ( 57.51, 10.01, 74.74) @@ -395,7 +395,7 @@ TGeoHype 391 Local ( -35.83, -11.64, 50.00) Global ( -5.83, 18.36 TGeoHype 392 Local ( -30.48, -22.15, 50.00) Global ( -0.48, 7.85, 80.00) TGeoHype 393 Local ( -22.15, -30.48, 50.00) Global ( 7.85, -0.48, 80.00) TGeoHype 394 Local ( -11.64, -35.83, 50.00) Global ( 18.36, -5.83, 80.00) -TGeoHype 395 Local ( -0.00, -37.68, 50.00) Global ( 30.00, -7.68, 80.00) +TGeoHype 395 Local ( 0.00, -37.68, 50.00) Global ( 30.00, -7.68, 80.00) TGeoHype 396 Local ( 11.64, -35.83, 50.00) Global ( 41.64, -5.83, 80.00) TGeoHype 397 Local ( 22.15, -30.48, 50.00) Global ( 52.15, -0.48, 80.00) TGeoHype 398 Local ( 30.48, -22.15, 50.00) Global ( 60.48, 7.85, 80.00) @@ -415,7 +415,7 @@ TGeoHype 411 Local ( -55.46, -18.02, -50.00) Global ( -25.46, 11.98 TGeoHype 412 Local ( -47.17, -34.27, -50.00) Global ( -17.17, -4.27, -20.00) TGeoHype 413 Local ( -34.27, -47.17, -50.00) Global ( -4.27, -17.17, -20.00) TGeoHype 414 Local ( -18.02, -55.46, -50.00) Global ( 11.98, -25.46, -20.00) -TGeoHype 415 Local ( -0.00, -58.31, -50.00) Global ( 30.00, -28.31, -20.00) +TGeoHype 415 Local ( 0.00, -58.31, -50.00) Global ( 30.00, -28.31, -20.00) TGeoHype 416 Local ( 18.02, -55.46, -50.00) Global ( 48.02, -25.46, -20.00) TGeoHype 417 Local ( 34.27, -47.17, -50.00) Global ( 64.27, -17.17, -20.00) TGeoHype 418 Local ( 47.17, -34.27, -50.00) Global ( 77.17, -4.27, -20.00) @@ -435,7 +435,7 @@ TGeoHype 431 Local ( -51.23, -16.65, -44.74) Global ( -21.23, 13.35 TGeoHype 432 Local ( -43.58, -31.66, -44.74) Global ( -13.58, -1.66, -14.74) TGeoHype 433 Local ( -31.66, -43.58, -44.74) Global ( -1.66, -13.58, -14.74) TGeoHype 434 Local ( -16.65, -51.23, -44.74) Global ( 13.35, -21.23, -14.74) -TGeoHype 435 Local ( -0.00, -53.86, -44.74) Global ( 30.00, -23.86, -14.74) +TGeoHype 435 Local ( 0.00, -53.86, -44.74) Global ( 30.00, -23.86, -14.74) TGeoHype 436 Local ( 16.65, -51.23, -44.74) Global ( 46.65, -21.23, -14.74) TGeoHype 437 Local ( 31.66, -43.58, -44.74) Global ( 61.66, -13.58, -14.74) TGeoHype 438 Local ( 43.58, -31.66, -44.74) Global ( 73.58, -1.66, -14.74) @@ -455,7 +455,7 @@ TGeoHype 451 Local ( -47.15, -15.32, -39.47) Global ( -17.15, 14.68 TGeoHype 452 Local ( -40.11, -29.14, -39.47) Global ( -10.11, 0.86, -9.47) TGeoHype 453 Local ( -29.14, -40.11, -39.47) Global ( 0.86, -10.11, -9.47) TGeoHype 454 Local ( -15.32, -47.15, -39.47) Global ( 14.68, -17.15, -9.47) -TGeoHype 455 Local ( -0.00, -49.58, -39.47) Global ( 30.00, -19.58, -9.47) +TGeoHype 455 Local ( 0.00, -49.58, -39.47) Global ( 30.00, -19.58, -9.47) TGeoHype 456 Local ( 15.32, -47.15, -39.47) Global ( 45.32, -17.15, -9.47) TGeoHype 457 Local ( 29.14, -40.11, -39.47) Global ( 59.14, -10.11, -9.47) TGeoHype 458 Local ( 40.11, -29.14, -39.47) Global ( 70.11, 0.86, -9.47) @@ -475,7 +475,7 @@ TGeoHype 471 Local ( -43.27, -14.06, -34.21) Global ( -13.27, 15.94 TGeoHype 472 Local ( -36.81, -26.74, -34.21) Global ( -6.81, 3.26, -4.21) TGeoHype 473 Local ( -26.74, -36.81, -34.21) Global ( 3.26, -6.81, -4.21) TGeoHype 474 Local ( -14.06, -43.27, -34.21) Global ( 15.94, -13.27, -4.21) -TGeoHype 475 Local ( -0.00, -45.50, -34.21) Global ( 30.00, -15.50, -4.21) +TGeoHype 475 Local ( 0.00, -45.50, -34.21) Global ( 30.00, -15.50, -4.21) TGeoHype 476 Local ( 14.06, -43.27, -34.21) Global ( 44.06, -13.27, -4.21) TGeoHype 477 Local ( 26.74, -36.81, -34.21) Global ( 56.74, -6.81, -4.21) TGeoHype 478 Local ( 36.81, -26.74, -34.21) Global ( 66.81, 3.26, -4.21) @@ -495,7 +495,7 @@ TGeoHype 491 Local ( -39.65, -12.88, -28.95) Global ( -9.65, 17.12 TGeoHype 492 Local ( -33.73, -24.50, -28.95) Global ( -3.73, 5.50, 1.05) TGeoHype 493 Local ( -24.50, -33.73, -28.95) Global ( 5.50, -3.73, 1.05) TGeoHype 494 Local ( -12.88, -39.65, -28.95) Global ( 17.12, -9.65, 1.05) -TGeoHype 495 Local ( -0.00, -41.69, -28.95) Global ( 30.00, -11.69, 1.05) +TGeoHype 495 Local ( 0.00, -41.69, -28.95) Global ( 30.00, -11.69, 1.05) TGeoHype 496 Local ( 12.88, -39.65, -28.95) Global ( 42.88, -9.65, 1.05) TGeoHype 497 Local ( 24.50, -33.73, -28.95) Global ( 54.50, -3.73, 1.05) TGeoHype 498 Local ( 33.73, -24.50, -28.95) Global ( 63.73, 5.50, 1.05) @@ -515,7 +515,7 @@ TGeoHype 511 Local ( -36.35, -11.81, -23.68) Global ( -6.35, 18.19 TGeoHype 512 Local ( -30.92, -22.47, -23.68) Global ( -0.92, 7.53, 6.32) TGeoHype 513 Local ( -22.47, -30.92, -23.68) Global ( 7.53, -0.92, 6.32) TGeoHype 514 Local ( -11.81, -36.35, -23.68) Global ( 18.19, -6.35, 6.32) -TGeoHype 515 Local ( -0.00, -38.22, -23.68) Global ( 30.00, -8.22, 6.32) +TGeoHype 515 Local ( 0.00, -38.22, -23.68) Global ( 30.00, -8.22, 6.32) TGeoHype 516 Local ( 11.81, -36.35, -23.68) Global ( 41.81, -6.35, 6.32) TGeoHype 517 Local ( 22.47, -30.92, -23.68) Global ( 52.47, -0.92, 6.32) TGeoHype 518 Local ( 30.92, -22.47, -23.68) Global ( 60.92, 7.53, 6.32) @@ -535,7 +535,7 @@ TGeoHype 531 Local ( -33.48, -10.88, -18.42) Global ( -3.48, 19.12 TGeoHype 532 Local ( -28.48, -20.69, -18.42) Global ( 1.52, 9.31, 11.58) TGeoHype 533 Local ( -20.69, -28.48, -18.42) Global ( 9.31, 1.52, 11.58) TGeoHype 534 Local ( -10.88, -33.48, -18.42) Global ( 19.12, -3.48, 11.58) -TGeoHype 535 Local ( -0.00, -35.20, -18.42) Global ( 30.00, -5.20, 11.58) +TGeoHype 535 Local ( 0.00, -35.20, -18.42) Global ( 30.00, -5.20, 11.58) TGeoHype 536 Local ( 10.88, -33.48, -18.42) Global ( 40.88, -3.48, 11.58) TGeoHype 537 Local ( 20.69, -28.48, -18.42) Global ( 50.69, 1.52, 11.58) TGeoHype 538 Local ( 28.48, -20.69, -18.42) Global ( 58.48, 9.31, 11.58) @@ -555,7 +555,7 @@ TGeoHype 551 Local ( -31.16, -10.12, -13.16) Global ( -1.16, 19.88 TGeoHype 552 Local ( -26.50, -19.26, -13.16) Global ( 3.50, 10.74, 16.84) TGeoHype 553 Local ( -19.26, -26.50, -13.16) Global ( 10.74, 3.50, 16.84) TGeoHype 554 Local ( -10.12, -31.16, -13.16) Global ( 19.88, -1.16, 16.84) -TGeoHype 555 Local ( -0.00, -32.76, -13.16) Global ( 30.00, -2.76, 16.84) +TGeoHype 555 Local ( 0.00, -32.76, -13.16) Global ( 30.00, -2.76, 16.84) TGeoHype 556 Local ( 10.12, -31.16, -13.16) Global ( 40.12, -1.16, 16.84) TGeoHype 557 Local ( 19.26, -26.50, -13.16) Global ( 49.26, 3.50, 16.84) TGeoHype 558 Local ( 26.50, -19.26, -13.16) Global ( 56.50, 10.74, 16.84) @@ -575,7 +575,7 @@ TGeoHype 571 Local ( -29.50, -9.59, -7.89) Global ( 0.50, 20.41 TGeoHype 572 Local ( -25.10, -18.23, -7.89) Global ( 4.90, 11.77, 22.11) TGeoHype 573 Local ( -18.23, -25.10, -7.89) Global ( 11.77, 4.90, 22.11) TGeoHype 574 Local ( -9.59, -29.50, -7.89) Global ( 20.41, 0.50, 22.11) -TGeoHype 575 Local ( -0.00, -31.02, -7.89) Global ( 30.00, -1.02, 22.11) +TGeoHype 575 Local ( 0.00, -31.02, -7.89) Global ( 30.00, -1.02, 22.11) TGeoHype 576 Local ( 9.59, -29.50, -7.89) Global ( 39.59, 0.50, 22.11) TGeoHype 577 Local ( 18.23, -25.10, -7.89) Global ( 48.23, 4.90, 22.11) TGeoHype 578 Local ( 25.10, -18.23, -7.89) Global ( 55.10, 11.77, 22.11) @@ -595,7 +595,7 @@ TGeoHype 591 Local ( -28.64, -9.31, -2.63) Global ( 1.36, 20.69 TGeoHype 592 Local ( -24.36, -17.70, -2.63) Global ( 5.64, 12.30, 27.37) TGeoHype 593 Local ( -17.70, -24.36, -2.63) Global ( 12.30, 5.64, 27.37) TGeoHype 594 Local ( -9.31, -28.64, -2.63) Global ( 20.69, 1.36, 27.37) -TGeoHype 595 Local ( -0.00, -30.12, -2.63) Global ( 30.00, -0.12, 27.37) +TGeoHype 595 Local ( 0.00, -30.12, -2.63) Global ( 30.00, -0.12, 27.37) TGeoHype 596 Local ( 9.31, -28.64, -2.63) Global ( 39.31, 1.36, 27.37) TGeoHype 597 Local ( 17.70, -24.36, -2.63) Global ( 47.70, 5.64, 27.37) TGeoHype 598 Local ( 24.36, -17.70, -2.63) Global ( 54.36, 12.30, 27.37) @@ -615,7 +615,7 @@ TGeoHype 611 Local ( -28.64, -9.31, 2.63) Global ( 1.36, 20.69 TGeoHype 612 Local ( -24.36, -17.70, 2.63) Global ( 5.64, 12.30, 32.63) TGeoHype 613 Local ( -17.70, -24.36, 2.63) Global ( 12.30, 5.64, 32.63) TGeoHype 614 Local ( -9.31, -28.64, 2.63) Global ( 20.69, 1.36, 32.63) -TGeoHype 615 Local ( -0.00, -30.12, 2.63) Global ( 30.00, -0.12, 32.63) +TGeoHype 615 Local ( 0.00, -30.12, 2.63) Global ( 30.00, -0.12, 32.63) TGeoHype 616 Local ( 9.31, -28.64, 2.63) Global ( 39.31, 1.36, 32.63) TGeoHype 617 Local ( 17.70, -24.36, 2.63) Global ( 47.70, 5.64, 32.63) TGeoHype 618 Local ( 24.36, -17.70, 2.63) Global ( 54.36, 12.30, 32.63) @@ -635,7 +635,7 @@ TGeoHype 631 Local ( -29.50, -9.59, 7.89) Global ( 0.50, 20.41 TGeoHype 632 Local ( -25.10, -18.23, 7.89) Global ( 4.90, 11.77, 37.89) TGeoHype 633 Local ( -18.23, -25.10, 7.89) Global ( 11.77, 4.90, 37.89) TGeoHype 634 Local ( -9.59, -29.50, 7.89) Global ( 20.41, 0.50, 37.89) -TGeoHype 635 Local ( -0.00, -31.02, 7.89) Global ( 30.00, -1.02, 37.89) +TGeoHype 635 Local ( 0.00, -31.02, 7.89) Global ( 30.00, -1.02, 37.89) TGeoHype 636 Local ( 9.59, -29.50, 7.89) Global ( 39.59, 0.50, 37.89) TGeoHype 637 Local ( 18.23, -25.10, 7.89) Global ( 48.23, 4.90, 37.89) TGeoHype 638 Local ( 25.10, -18.23, 7.89) Global ( 55.10, 11.77, 37.89) @@ -655,7 +655,7 @@ TGeoHype 651 Local ( -31.16, -10.12, 13.16) Global ( -1.16, 19.88 TGeoHype 652 Local ( -26.50, -19.26, 13.16) Global ( 3.50, 10.74, 43.16) TGeoHype 653 Local ( -19.26, -26.50, 13.16) Global ( 10.74, 3.50, 43.16) TGeoHype 654 Local ( -10.12, -31.16, 13.16) Global ( 19.88, -1.16, 43.16) -TGeoHype 655 Local ( -0.00, -32.76, 13.16) Global ( 30.00, -2.76, 43.16) +TGeoHype 655 Local ( 0.00, -32.76, 13.16) Global ( 30.00, -2.76, 43.16) TGeoHype 656 Local ( 10.12, -31.16, 13.16) Global ( 40.12, -1.16, 43.16) TGeoHype 657 Local ( 19.26, -26.50, 13.16) Global ( 49.26, 3.50, 43.16) TGeoHype 658 Local ( 26.50, -19.26, 13.16) Global ( 56.50, 10.74, 43.16) @@ -675,7 +675,7 @@ TGeoHype 671 Local ( -33.48, -10.88, 18.42) Global ( -3.48, 19.12 TGeoHype 672 Local ( -28.48, -20.69, 18.42) Global ( 1.52, 9.31, 48.42) TGeoHype 673 Local ( -20.69, -28.48, 18.42) Global ( 9.31, 1.52, 48.42) TGeoHype 674 Local ( -10.88, -33.48, 18.42) Global ( 19.12, -3.48, 48.42) -TGeoHype 675 Local ( -0.00, -35.20, 18.42) Global ( 30.00, -5.20, 48.42) +TGeoHype 675 Local ( 0.00, -35.20, 18.42) Global ( 30.00, -5.20, 48.42) TGeoHype 676 Local ( 10.88, -33.48, 18.42) Global ( 40.88, -3.48, 48.42) TGeoHype 677 Local ( 20.69, -28.48, 18.42) Global ( 50.69, 1.52, 48.42) TGeoHype 678 Local ( 28.48, -20.69, 18.42) Global ( 58.48, 9.31, 48.42) @@ -695,7 +695,7 @@ TGeoHype 691 Local ( -36.35, -11.81, 23.68) Global ( -6.35, 18.19 TGeoHype 692 Local ( -30.92, -22.47, 23.68) Global ( -0.92, 7.53, 53.68) TGeoHype 693 Local ( -22.47, -30.92, 23.68) Global ( 7.53, -0.92, 53.68) TGeoHype 694 Local ( -11.81, -36.35, 23.68) Global ( 18.19, -6.35, 53.68) -TGeoHype 695 Local ( -0.00, -38.22, 23.68) Global ( 30.00, -8.22, 53.68) +TGeoHype 695 Local ( 0.00, -38.22, 23.68) Global ( 30.00, -8.22, 53.68) TGeoHype 696 Local ( 11.81, -36.35, 23.68) Global ( 41.81, -6.35, 53.68) TGeoHype 697 Local ( 22.47, -30.92, 23.68) Global ( 52.47, -0.92, 53.68) TGeoHype 698 Local ( 30.92, -22.47, 23.68) Global ( 60.92, 7.53, 53.68) @@ -715,7 +715,7 @@ TGeoHype 711 Local ( -39.65, -12.88, 28.95) Global ( -9.65, 17.12 TGeoHype 712 Local ( -33.73, -24.50, 28.95) Global ( -3.73, 5.50, 58.95) TGeoHype 713 Local ( -24.50, -33.73, 28.95) Global ( 5.50, -3.73, 58.95) TGeoHype 714 Local ( -12.88, -39.65, 28.95) Global ( 17.12, -9.65, 58.95) -TGeoHype 715 Local ( -0.00, -41.69, 28.95) Global ( 30.00, -11.69, 58.95) +TGeoHype 715 Local ( 0.00, -41.69, 28.95) Global ( 30.00, -11.69, 58.95) TGeoHype 716 Local ( 12.88, -39.65, 28.95) Global ( 42.88, -9.65, 58.95) TGeoHype 717 Local ( 24.50, -33.73, 28.95) Global ( 54.50, -3.73, 58.95) TGeoHype 718 Local ( 33.73, -24.50, 28.95) Global ( 63.73, 5.50, 58.95) @@ -735,7 +735,7 @@ TGeoHype 731 Local ( -43.27, -14.06, 34.21) Global ( -13.27, 15.94 TGeoHype 732 Local ( -36.81, -26.74, 34.21) Global ( -6.81, 3.26, 64.21) TGeoHype 733 Local ( -26.74, -36.81, 34.21) Global ( 3.26, -6.81, 64.21) TGeoHype 734 Local ( -14.06, -43.27, 34.21) Global ( 15.94, -13.27, 64.21) -TGeoHype 735 Local ( -0.00, -45.50, 34.21) Global ( 30.00, -15.50, 64.21) +TGeoHype 735 Local ( 0.00, -45.50, 34.21) Global ( 30.00, -15.50, 64.21) TGeoHype 736 Local ( 14.06, -43.27, 34.21) Global ( 44.06, -13.27, 64.21) TGeoHype 737 Local ( 26.74, -36.81, 34.21) Global ( 56.74, -6.81, 64.21) TGeoHype 738 Local ( 36.81, -26.74, 34.21) Global ( 66.81, 3.26, 64.21) @@ -755,7 +755,7 @@ TGeoHype 751 Local ( -47.15, -15.32, 39.47) Global ( -17.15, 14.68 TGeoHype 752 Local ( -40.11, -29.14, 39.47) Global ( -10.11, 0.86, 69.47) TGeoHype 753 Local ( -29.14, -40.11, 39.47) Global ( 0.86, -10.11, 69.47) TGeoHype 754 Local ( -15.32, -47.15, 39.47) Global ( 14.68, -17.15, 69.47) -TGeoHype 755 Local ( -0.00, -49.58, 39.47) Global ( 30.00, -19.58, 69.47) +TGeoHype 755 Local ( 0.00, -49.58, 39.47) Global ( 30.00, -19.58, 69.47) TGeoHype 756 Local ( 15.32, -47.15, 39.47) Global ( 45.32, -17.15, 69.47) TGeoHype 757 Local ( 29.14, -40.11, 39.47) Global ( 59.14, -10.11, 69.47) TGeoHype 758 Local ( 40.11, -29.14, 39.47) Global ( 70.11, 0.86, 69.47) @@ -775,7 +775,7 @@ TGeoHype 771 Local ( -51.23, -16.65, 44.74) Global ( -21.23, 13.35 TGeoHype 772 Local ( -43.58, -31.66, 44.74) Global ( -13.58, -1.66, 74.74) TGeoHype 773 Local ( -31.66, -43.58, 44.74) Global ( -1.66, -13.58, 74.74) TGeoHype 774 Local ( -16.65, -51.23, 44.74) Global ( 13.35, -21.23, 74.74) -TGeoHype 775 Local ( -0.00, -53.86, 44.74) Global ( 30.00, -23.86, 74.74) +TGeoHype 775 Local ( 0.00, -53.86, 44.74) Global ( 30.00, -23.86, 74.74) TGeoHype 776 Local ( 16.65, -51.23, 44.74) Global ( 46.65, -21.23, 74.74) TGeoHype 777 Local ( 31.66, -43.58, 44.74) Global ( 61.66, -13.58, 74.74) TGeoHype 778 Local ( 43.58, -31.66, 44.74) Global ( 73.58, -1.66, 74.74) @@ -795,7 +795,7 @@ TGeoHype 791 Local ( -55.46, -18.02, 50.00) Global ( -25.46, 11.98 TGeoHype 792 Local ( -47.17, -34.27, 50.00) Global ( -17.17, -4.27, 80.00) TGeoHype 793 Local ( -34.27, -47.17, 50.00) Global ( -4.27, -17.17, 80.00) TGeoHype 794 Local ( -18.02, -55.46, 50.00) Global ( 11.98, -25.46, 80.00) -TGeoHype 795 Local ( -0.00, -58.31, 50.00) Global ( 30.00, -28.31, 80.00) +TGeoHype 795 Local ( 0.00, -58.31, 50.00) Global ( 30.00, -28.31, 80.00) TGeoHype 796 Local ( 18.02, -55.46, 50.00) Global ( 48.02, -25.46, 80.00) TGeoHype 797 Local ( 34.27, -47.17, 50.00) Global ( 64.27, -17.17, 80.00) TGeoHype 798 Local ( 47.17, -34.27, 50.00) Global ( 77.17, -4.27, 80.00) diff --git a/examples/ClientTests/ref/Ref_Paraboloid.txt b/examples/ClientTests/ref/Ref_Paraboloid.txt index 7d4b1dc19b183154fdda07ede58bcdff8f94a7ca..762c935ba7cbfb53752bfb65babcda7e4a5d9338 100644 --- a/examples/ClientTests/ref/Ref_Paraboloid.txt +++ b/examples/ClientTests/ref/Ref_Paraboloid.txt @@ -16,7 +16,7 @@ TGeoParaboloid 12 Local ( -9.51, -3.09, -50.00) Global ( 20.49, 26.91 TGeoParaboloid 13 Local ( -8.09, -5.88, -50.00) Global ( 21.91, 24.12, -20.00) TGeoParaboloid 14 Local ( -5.88, -8.09, -50.00) Global ( 24.12, 21.91, -20.00) TGeoParaboloid 15 Local ( -3.09, -9.51, -50.00) Global ( 26.91, 20.49, -20.00) -TGeoParaboloid 16 Local ( -0.00, -10.00, -50.00) Global ( 30.00, 20.00, -20.00) +TGeoParaboloid 16 Local ( 0.00, -10.00, -50.00) Global ( 30.00, 20.00, -20.00) TGeoParaboloid 17 Local ( 3.09, -9.51, -50.00) Global ( 33.09, 20.49, -20.00) TGeoParaboloid 18 Local ( 5.88, -8.09, -50.00) Global ( 35.88, 21.91, -20.00) TGeoParaboloid 19 Local ( 8.09, -5.88, -50.00) Global ( 38.09, 24.12, -20.00) @@ -36,7 +36,7 @@ TGeoParaboloid 32 Local ( -12.64, -4.11, -40.43) Global ( 17.36, 25.89 TGeoParaboloid 33 Local ( -10.75, -7.81, -40.43) Global ( 19.25, 22.19, -10.43) TGeoParaboloid 34 Local ( -7.81, -10.75, -40.43) Global ( 22.19, 19.25, -10.43) TGeoParaboloid 35 Local ( -4.11, -12.64, -40.43) Global ( 25.89, 17.36, -10.43) -TGeoParaboloid 36 Local ( -0.00, -13.29, -40.43) Global ( 30.00, 16.71, -10.43) +TGeoParaboloid 36 Local ( 0.00, -13.29, -40.43) Global ( 30.00, 16.71, -10.43) TGeoParaboloid 37 Local ( 4.11, -12.64, -40.43) Global ( 34.11, 17.36, -10.43) TGeoParaboloid 38 Local ( 7.81, -10.75, -40.43) Global ( 37.81, 19.25, -10.43) TGeoParaboloid 39 Local ( 10.75, -7.81, -40.43) Global ( 40.75, 22.19, -10.43) @@ -56,7 +56,7 @@ TGeoParaboloid 52 Local ( -14.64, -4.76, -32.88) Global ( 15.36, 25.24 TGeoParaboloid 53 Local ( -12.45, -9.05, -32.88) Global ( 17.55, 20.95, -2.88) TGeoParaboloid 54 Local ( -9.05, -12.45, -32.88) Global ( 20.95, 17.55, -2.88) TGeoParaboloid 55 Local ( -4.76, -14.64, -32.88) Global ( 25.24, 15.36, -2.88) -TGeoParaboloid 56 Local ( -0.00, -15.39, -32.88) Global ( 30.00, 14.61, -2.88) +TGeoParaboloid 56 Local ( 0.00, -15.39, -32.88) Global ( 30.00, 14.61, -2.88) TGeoParaboloid 57 Local ( 4.76, -14.64, -32.88) Global ( 34.76, 15.36, -2.88) TGeoParaboloid 58 Local ( 9.05, -12.45, -32.88) Global ( 39.05, 17.55, -2.88) TGeoParaboloid 59 Local ( 12.45, -9.05, -32.88) Global ( 42.45, 20.95, -2.88) @@ -76,7 +76,7 @@ TGeoParaboloid 72 Local ( -16.03, -5.21, -27.00) Global ( 13.97, 24.79 TGeoParaboloid 73 Local ( -13.63, -9.91, -27.00) Global ( 16.37, 20.09, 3.00) TGeoParaboloid 74 Local ( -9.91, -13.63, -27.00) Global ( 20.09, 16.37, 3.00) TGeoParaboloid 75 Local ( -5.21, -16.03, -27.00) Global ( 24.79, 13.97, 3.00) -TGeoParaboloid 76 Local ( -0.00, -16.85, -27.00) Global ( 30.00, 13.15, 3.00) +TGeoParaboloid 76 Local ( 0.00, -16.85, -27.00) Global ( 30.00, 13.15, 3.00) TGeoParaboloid 77 Local ( 5.21, -16.03, -27.00) Global ( 35.21, 13.97, 3.00) TGeoParaboloid 78 Local ( 9.91, -13.63, -27.00) Global ( 39.91, 16.37, 3.00) TGeoParaboloid 79 Local ( 13.63, -9.91, -27.00) Global ( 43.63, 20.09, 3.00) @@ -96,7 +96,7 @@ TGeoParaboloid 92 Local ( -17.06, -5.54, -22.27) Global ( 12.94, 24.46 TGeoParaboloid 93 Local ( -14.51, -10.54, -22.27) Global ( 15.49, 19.46, 7.73) TGeoParaboloid 94 Local ( -10.54, -14.51, -22.27) Global ( 19.46, 15.49, 7.73) TGeoParaboloid 95 Local ( -5.54, -17.06, -22.27) Global ( 24.46, 12.94, 7.73) -TGeoParaboloid 96 Local ( -0.00, -17.94, -22.27) Global ( 30.00, 12.06, 7.73) +TGeoParaboloid 96 Local ( 0.00, -17.94, -22.27) Global ( 30.00, 12.06, 7.73) TGeoParaboloid 97 Local ( 5.54, -17.06, -22.27) Global ( 35.54, 12.94, 7.73) TGeoParaboloid 98 Local ( 10.54, -14.51, -22.27) Global ( 40.54, 15.49, 7.73) TGeoParaboloid 99 Local ( 14.51, -10.54, -22.27) Global ( 44.51, 19.46, 7.73) @@ -116,7 +116,7 @@ TGeoParaboloid 112 Local ( -17.88, -5.81, -18.32) Global ( 12.12, 24.19 TGeoParaboloid 113 Local ( -15.21, -11.05, -18.32) Global ( 14.79, 18.95, 11.68) TGeoParaboloid 114 Local ( -11.05, -15.21, -18.32) Global ( 18.95, 14.79, 11.68) TGeoParaboloid 115 Local ( -5.81, -17.88, -18.32) Global ( 24.19, 12.12, 11.68) -TGeoParaboloid 116 Local ( -0.00, -18.80, -18.32) Global ( 30.00, 11.20, 11.68) +TGeoParaboloid 116 Local ( 0.00, -18.80, -18.32) Global ( 30.00, 11.20, 11.68) TGeoParaboloid 117 Local ( 5.81, -17.88, -18.32) Global ( 35.81, 12.12, 11.68) TGeoParaboloid 118 Local ( 11.05, -15.21, -18.32) Global ( 41.05, 14.79, 11.68) TGeoParaboloid 119 Local ( 15.21, -11.05, -18.32) Global ( 45.21, 18.95, 11.68) @@ -136,7 +136,7 @@ TGeoParaboloid 132 Local ( -18.56, -6.03, -14.90) Global ( 11.44, 23.97 TGeoParaboloid 133 Local ( -15.79, -11.47, -14.90) Global ( 14.21, 18.53, 15.10) TGeoParaboloid 134 Local ( -11.47, -15.79, -14.90) Global ( 18.53, 14.21, 15.10) TGeoParaboloid 135 Local ( -6.03, -18.56, -14.90) Global ( 23.97, 11.44, 15.10) -TGeoParaboloid 136 Local ( -0.00, -19.51, -14.90) Global ( 30.00, 10.49, 15.10) +TGeoParaboloid 136 Local ( 0.00, -19.51, -14.90) Global ( 30.00, 10.49, 15.10) TGeoParaboloid 137 Local ( 6.03, -18.56, -14.90) Global ( 36.03, 11.44, 15.10) TGeoParaboloid 138 Local ( 11.47, -15.79, -14.90) Global ( 41.47, 14.21, 15.10) TGeoParaboloid 139 Local ( 15.79, -11.47, -14.90) Global ( 45.79, 18.53, 15.10) @@ -156,7 +156,7 @@ TGeoParaboloid 152 Local ( -19.14, -6.22, -11.85) Global ( 10.86, 23.78 TGeoParaboloid 153 Local ( -16.29, -11.83, -11.85) Global ( 13.71, 18.17, 18.15) TGeoParaboloid 154 Local ( -11.83, -16.29, -11.85) Global ( 18.17, 13.71, 18.15) TGeoParaboloid 155 Local ( -6.22, -19.14, -11.85) Global ( 23.78, 10.86, 18.15) -TGeoParaboloid 156 Local ( -0.00, -20.13, -11.85) Global ( 30.00, 9.87, 18.15) +TGeoParaboloid 156 Local ( 0.00, -20.13, -11.85) Global ( 30.00, 9.87, 18.15) TGeoParaboloid 157 Local ( 6.22, -19.14, -11.85) Global ( 36.22, 10.86, 18.15) TGeoParaboloid 158 Local ( 11.83, -16.29, -11.85) Global ( 41.83, 13.71, 18.15) TGeoParaboloid 159 Local ( 16.29, -11.83, -11.85) Global ( 46.29, 18.17, 18.15) @@ -176,7 +176,7 @@ TGeoParaboloid 172 Local ( -19.67, -6.39, -9.04) Global ( 10.33, 23.61 TGeoParaboloid 173 Local ( -16.73, -12.16, -9.04) Global ( 13.27, 17.84, 20.96) TGeoParaboloid 174 Local ( -12.16, -16.73, -9.04) Global ( 17.84, 13.27, 20.96) TGeoParaboloid 175 Local ( -6.39, -19.67, -9.04) Global ( 23.61, 10.33, 20.96) -TGeoParaboloid 176 Local ( -0.00, -20.68, -9.04) Global ( 30.00, 9.32, 20.96) +TGeoParaboloid 176 Local ( 0.00, -20.68, -9.04) Global ( 30.00, 9.32, 20.96) TGeoParaboloid 177 Local ( 6.39, -19.67, -9.04) Global ( 36.39, 10.33, 20.96) TGeoParaboloid 178 Local ( 12.16, -16.73, -9.04) Global ( 42.16, 13.27, 20.96) TGeoParaboloid 179 Local ( 16.73, -12.16, -9.04) Global ( 46.73, 17.84, 20.96) @@ -196,7 +196,7 @@ TGeoParaboloid 192 Local ( -20.15, -6.55, -6.36) Global ( 9.85, 23.45 TGeoParaboloid 193 Local ( -17.14, -12.46, -6.36) Global ( 12.86, 17.54, 23.64) TGeoParaboloid 194 Local ( -12.46, -17.14, -6.36) Global ( 17.54, 12.86, 23.64) TGeoParaboloid 195 Local ( -6.55, -20.15, -6.36) Global ( 23.45, 9.85, 23.64) -TGeoParaboloid 196 Local ( -0.00, -21.19, -6.36) Global ( 30.00, 8.81, 23.64) +TGeoParaboloid 196 Local ( 0.00, -21.19, -6.36) Global ( 30.00, 8.81, 23.64) TGeoParaboloid 197 Local ( 6.55, -20.15, -6.36) Global ( 36.55, 9.85, 23.64) TGeoParaboloid 198 Local ( 12.46, -17.14, -6.36) Global ( 42.46, 12.86, 23.64) TGeoParaboloid 199 Local ( 17.14, -12.46, -6.36) Global ( 47.14, 17.54, 23.64) @@ -216,7 +216,7 @@ TGeoParaboloid 212 Local ( -20.62, -6.70, -3.76) Global ( 9.38, 23.30 TGeoParaboloid 213 Local ( -17.54, -12.74, -3.76) Global ( 12.46, 17.26, 26.24) TGeoParaboloid 214 Local ( -12.74, -17.54, -3.76) Global ( 17.26, 12.46, 26.24) TGeoParaboloid 215 Local ( -6.70, -20.62, -3.76) Global ( 23.30, 9.38, 26.24) -TGeoParaboloid 216 Local ( -0.00, -21.68, -3.76) Global ( 30.00, 8.32, 26.24) +TGeoParaboloid 216 Local ( 0.00, -21.68, -3.76) Global ( 30.00, 8.32, 26.24) TGeoParaboloid 217 Local ( 6.70, -20.62, -3.76) Global ( 36.70, 9.38, 26.24) TGeoParaboloid 218 Local ( 12.74, -17.54, -3.76) Global ( 42.74, 12.46, 26.24) TGeoParaboloid 219 Local ( 17.54, -12.74, -3.76) Global ( 47.54, 17.26, 26.24) @@ -236,7 +236,7 @@ TGeoParaboloid 232 Local ( -21.07, -6.85, -1.14) Global ( 8.93, 23.15 TGeoParaboloid 233 Local ( -17.92, -13.02, -1.14) Global ( 12.08, 16.98, 28.86) TGeoParaboloid 234 Local ( -13.02, -17.92, -1.14) Global ( 16.98, 12.08, 28.86) TGeoParaboloid 235 Local ( -6.85, -21.07, -1.14) Global ( 23.15, 8.93, 28.86) -TGeoParaboloid 236 Local ( -0.00, -22.16, -1.14) Global ( 30.00, 7.84, 28.86) +TGeoParaboloid 236 Local ( 0.00, -22.16, -1.14) Global ( 30.00, 7.84, 28.86) TGeoParaboloid 237 Local ( 6.85, -21.07, -1.14) Global ( 36.85, 8.93, 28.86) TGeoParaboloid 238 Local ( 13.02, -17.92, -1.14) Global ( 43.02, 12.08, 28.86) TGeoParaboloid 239 Local ( 17.92, -13.02, -1.14) Global ( 47.92, 16.98, 28.86) @@ -256,7 +256,7 @@ TGeoParaboloid 252 Local ( -21.53, -7.00, 1.56) Global ( 8.47, 23.00 TGeoParaboloid 253 Local ( -18.31, -13.31, 1.56) Global ( 11.69, 16.69, 31.56) TGeoParaboloid 254 Local ( -13.31, -18.31, 1.56) Global ( 16.69, 11.69, 31.56) TGeoParaboloid 255 Local ( -7.00, -21.53, 1.56) Global ( 23.00, 8.47, 31.56) -TGeoParaboloid 256 Local ( -0.00, -22.64, 1.56) Global ( 30.00, 7.36, 31.56) +TGeoParaboloid 256 Local ( 0.00, -22.64, 1.56) Global ( 30.00, 7.36, 31.56) TGeoParaboloid 257 Local ( 7.00, -21.53, 1.56) Global ( 37.00, 8.47, 31.56) TGeoParaboloid 258 Local ( 13.31, -18.31, 1.56) Global ( 43.31, 11.69, 31.56) TGeoParaboloid 259 Local ( 18.31, -13.31, 1.56) Global ( 48.31, 16.69, 31.56) @@ -276,7 +276,7 @@ TGeoParaboloid 272 Local ( -22.01, -7.15, 4.43) Global ( 7.99, 22.85 TGeoParaboloid 273 Local ( -18.72, -13.60, 4.43) Global ( 11.28, 16.40, 34.43) TGeoParaboloid 274 Local ( -13.60, -18.72, 4.43) Global ( 16.40, 11.28, 34.43) TGeoParaboloid 275 Local ( -7.15, -22.01, 4.43) Global ( 22.85, 7.99, 34.43) -TGeoParaboloid 276 Local ( -0.00, -23.14, 4.43) Global ( 30.00, 6.86, 34.43) +TGeoParaboloid 276 Local ( 0.00, -23.14, 4.43) Global ( 30.00, 6.86, 34.43) TGeoParaboloid 277 Local ( 7.15, -22.01, 4.43) Global ( 37.15, 7.99, 34.43) TGeoParaboloid 278 Local ( 13.60, -18.72, 4.43) Global ( 43.60, 11.28, 34.43) TGeoParaboloid 279 Local ( 18.72, -13.60, 4.43) Global ( 48.72, 16.40, 34.43) @@ -296,7 +296,7 @@ TGeoParaboloid 292 Local ( -22.52, -7.32, 7.56) Global ( 7.48, 22.68 TGeoParaboloid 293 Local ( -19.15, -13.92, 7.56) Global ( 10.85, 16.08, 37.56) TGeoParaboloid 294 Local ( -13.92, -19.15, 7.56) Global ( 16.08, 10.85, 37.56) TGeoParaboloid 295 Local ( -7.32, -22.52, 7.56) Global ( 22.68, 7.48, 37.56) -TGeoParaboloid 296 Local ( -0.00, -23.68, 7.56) Global ( 30.00, 6.32, 37.56) +TGeoParaboloid 296 Local ( 0.00, -23.68, 7.56) Global ( 30.00, 6.32, 37.56) TGeoParaboloid 297 Local ( 7.32, -22.52, 7.56) Global ( 37.32, 7.48, 37.56) TGeoParaboloid 298 Local ( 13.92, -19.15, 7.56) Global ( 43.92, 10.85, 37.56) TGeoParaboloid 299 Local ( 19.15, -13.92, 7.56) Global ( 49.15, 16.08, 37.56) @@ -316,7 +316,7 @@ TGeoParaboloid 312 Local ( -23.08, -7.50, 11.11) Global ( 6.92, 22.50 TGeoParaboloid 313 Local ( -19.63, -14.26, 11.11) Global ( 10.37, 15.74, 41.11) TGeoParaboloid 314 Local ( -14.26, -19.63, 11.11) Global ( 15.74, 10.37, 41.11) TGeoParaboloid 315 Local ( -7.50, -23.08, 11.11) Global ( 22.50, 6.92, 41.11) -TGeoParaboloid 316 Local ( -0.00, -24.27, 11.11) Global ( 30.00, 5.73, 41.11) +TGeoParaboloid 316 Local ( 0.00, -24.27, 11.11) Global ( 30.00, 5.73, 41.11) TGeoParaboloid 317 Local ( 7.50, -23.08, 11.11) Global ( 37.50, 6.92, 41.11) TGeoParaboloid 318 Local ( 14.26, -19.63, 11.11) Global ( 44.26, 10.37, 41.11) TGeoParaboloid 319 Local ( 19.63, -14.26, 11.11) Global ( 49.63, 15.74, 41.11) @@ -336,7 +336,7 @@ TGeoParaboloid 332 Local ( -23.72, -7.71, 15.28) Global ( 6.28, 22.29 TGeoParaboloid 333 Local ( -20.18, -14.66, 15.28) Global ( 9.82, 15.34, 45.28) TGeoParaboloid 334 Local ( -14.66, -20.18, 15.28) Global ( 15.34, 9.82, 45.28) TGeoParaboloid 335 Local ( -7.71, -23.72, 15.28) Global ( 22.29, 6.28, 45.28) -TGeoParaboloid 336 Local ( -0.00, -24.94, 15.28) Global ( 30.00, 5.06, 45.28) +TGeoParaboloid 336 Local ( 0.00, -24.94, 15.28) Global ( 30.00, 5.06, 45.28) TGeoParaboloid 337 Local ( 7.71, -23.72, 15.28) Global ( 37.71, 6.28, 45.28) TGeoParaboloid 338 Local ( 14.66, -20.18, 15.28) Global ( 44.66, 9.82, 45.28) TGeoParaboloid 339 Local ( 20.18, -14.66, 15.28) Global ( 50.18, 15.34, 45.28) @@ -356,7 +356,7 @@ TGeoParaboloid 352 Local ( -24.49, -7.96, 20.39) Global ( 5.51, 22.04 TGeoParaboloid 353 Local ( -20.83, -15.14, 20.39) Global ( 9.17, 14.86, 50.39) TGeoParaboloid 354 Local ( -15.14, -20.83, 20.39) Global ( 14.86, 9.17, 50.39) TGeoParaboloid 355 Local ( -7.96, -24.49, 20.39) Global ( 22.04, 5.51, 50.39) -TGeoParaboloid 356 Local ( -0.00, -25.75, 20.39) Global ( 30.00, 4.25, 50.39) +TGeoParaboloid 356 Local ( 0.00, -25.75, 20.39) Global ( 30.00, 4.25, 50.39) TGeoParaboloid 357 Local ( 7.96, -24.49, 20.39) Global ( 37.96, 5.51, 50.39) TGeoParaboloid 358 Local ( 15.14, -20.83, 20.39) Global ( 45.14, 9.17, 50.39) TGeoParaboloid 359 Local ( 20.83, -15.14, 20.39) Global ( 50.83, 14.86, 50.39) @@ -376,7 +376,7 @@ TGeoParaboloid 372 Local ( -25.45, -8.27, 27.01) Global ( 4.55, 21.73 TGeoParaboloid 373 Local ( -21.65, -15.73, 27.01) Global ( 8.35, 14.27, 57.01) TGeoParaboloid 374 Local ( -15.73, -21.65, 27.01) Global ( 14.27, 8.35, 57.01) TGeoParaboloid 375 Local ( -8.27, -25.45, 27.01) Global ( 21.73, 4.55, 57.01) -TGeoParaboloid 376 Local ( -0.00, -26.76, 27.01) Global ( 30.00, 3.24, 57.01) +TGeoParaboloid 376 Local ( 0.00, -26.76, 27.01) Global ( 30.00, 3.24, 57.01) TGeoParaboloid 377 Local ( 8.27, -25.45, 27.01) Global ( 38.27, 4.55, 57.01) TGeoParaboloid 378 Local ( 15.73, -21.65, 27.01) Global ( 45.73, 8.35, 57.01) TGeoParaboloid 379 Local ( 21.65, -15.73, 27.01) Global ( 51.65, 14.27, 57.01) @@ -396,7 +396,7 @@ TGeoParaboloid 392 Local ( -26.72, -8.68, 36.15) Global ( 3.28, 21.32 TGeoParaboloid 393 Local ( -22.73, -16.51, 36.15) Global ( 7.27, 13.49, 66.15) TGeoParaboloid 394 Local ( -16.51, -22.73, 36.15) Global ( 13.49, 7.27, 66.15) TGeoParaboloid 395 Local ( -8.68, -26.72, 36.15) Global ( 21.32, 3.28, 66.15) -TGeoParaboloid 396 Local ( -0.00, -28.09, 36.15) Global ( 30.00, 1.91, 66.15) +TGeoParaboloid 396 Local ( 0.00, -28.09, 36.15) Global ( 30.00, 1.91, 66.15) TGeoParaboloid 397 Local ( 8.68, -26.72, 36.15) Global ( 38.68, 3.28, 66.15) TGeoParaboloid 398 Local ( 16.51, -22.73, 36.15) Global ( 46.51, 7.27, 66.15) TGeoParaboloid 399 Local ( 22.73, -16.51, 36.15) Global ( 52.73, 13.49, 66.15) @@ -416,7 +416,7 @@ TGeoParaboloid 412 Local ( -28.53, -9.27, 50.00) Global ( 1.47, 20.73 TGeoParaboloid 413 Local ( -24.27, -17.63, 50.00) Global ( 5.73, 12.37, 80.00) TGeoParaboloid 414 Local ( -17.63, -24.27, 50.00) Global ( 12.37, 5.73, 80.00) TGeoParaboloid 415 Local ( -9.27, -28.53, 50.00) Global ( 20.73, 1.47, 80.00) -TGeoParaboloid 416 Local ( -0.00, -30.00, 50.00) Global ( 30.00, 0.00, 80.00) +TGeoParaboloid 416 Local ( 0.00, -30.00, 50.00) Global ( 30.00, 0.00, 80.00) TGeoParaboloid 417 Local ( 9.27, -28.53, 50.00) Global ( 39.27, 1.47, 80.00) TGeoParaboloid 418 Local ( 17.63, -24.27, 50.00) Global ( 47.63, 5.73, 80.00) TGeoParaboloid 419 Local ( 24.27, -17.63, 50.00) Global ( 54.27, 12.37, 80.00) diff --git a/examples/ClientTests/ref/Ref_PseudoTrap.txt b/examples/ClientTests/ref/Ref_PseudoTrap.txt index 941eaf611c512ade3dcaf6eff5ccecfd5effc49c..ff634766e02e710c3e1a563b92db7a6b3b4ba658 100644 --- a/examples/ClientTests/ref/Ref_PseudoTrap.txt +++ b/examples/ClientTests/ref/Ref_PseudoTrap.txt @@ -1,12 +1,50 @@ -ShapeCheck[0] TGeoCompositeShape 6 Mesh-points: -TGeoCompositeShape PseudoTrap N(mesh)=6 N(vert)=6 N(seg)=0 N(pols)=0 +ShapeCheck[0] TGeoCompositeShape 44 Mesh-points: +TGeoCompositeShape PseudoTrap N(mesh)=44 N(vert)=44 N(seg)=0 N(pols)=0 TGeoCompositeShape 0 Local ( -33.00, 30.00, -30.00) Global ( -3.00, 60.00, 20.00) TGeoCompositeShape 1 Local ( 33.00, 30.00, -30.00) Global ( 63.00, 60.00, 20.00) -TGeoCompositeShape 2 Local ( -3.00, -10.00, 30.00) Global ( 27.00, 20.00, 80.00) -TGeoCompositeShape 3 Local ( -3.00, 10.00, 30.00) Global ( 27.00, 40.00, 80.00) -TGeoCompositeShape 4 Local ( 3.00, 10.00, 30.00) Global ( 33.00, 40.00, 80.00) -TGeoCompositeShape 5 Local ( 3.00, -10.00, 30.00) Global ( 33.00, 20.00, 80.00) -TGeoCompositeShape Bounding box: dx= 33.00 dy= 30.00 dz= 30.00 Origin: x= 0.00 y= 0.00 z= 0.00 +TGeoCompositeShape 2 Local ( -15.00, -10.00, 30.00) Global ( 15.00, 20.00, 80.00) +TGeoCompositeShape 3 Local ( -15.00, 10.00, 30.00) Global ( 15.00, 40.00, 80.00) +TGeoCompositeShape 4 Local ( 15.00, 10.00, 30.00) Global ( 45.00, 40.00, 80.00) +TGeoCompositeShape 5 Local ( 15.00, -10.00, 30.00) Global ( 45.00, 20.00, 80.00) +TGeoCompositeShape 6 Local ( -30.66, 30.00, -33.09) Global ( -0.66, 60.00, 16.91) +TGeoCompositeShape 7 Local ( -28.02, 30.00, -35.94) Global ( 1.98, 60.00, 14.06) +TGeoCompositeShape 8 Local ( -25.13, 30.00, -38.52) Global ( 4.87, 60.00, 11.48) +TGeoCompositeShape 9 Local ( -21.99, 30.00, -40.81) Global ( 8.01, 60.00, 9.19) +TGeoCompositeShape 10 Local ( -18.65, 30.00, -42.78) Global ( 11.35, 60.00, 7.22) +TGeoCompositeShape 11 Local ( -15.14, 30.00, -44.42) Global ( 14.86, 60.00, 5.58) +TGeoCompositeShape 12 Local ( -11.48, 30.00, -45.71) Global ( 18.52, 60.00, 4.29) +TGeoCompositeShape 13 Local ( -7.71, 30.00, -46.64) Global ( 22.29, 60.00, 3.36) +TGeoCompositeShape 14 Local ( -3.87, 30.00, -47.21) Global ( 26.13, 60.00, 2.79) +TGeoCompositeShape 15 Local ( 0.00, 30.00, -47.39) Global ( 30.00, 60.00, 2.61) +TGeoCompositeShape 16 Local ( 3.87, 30.00, -47.21) Global ( 33.87, 60.00, 2.79) +TGeoCompositeShape 17 Local ( 7.71, 30.00, -46.64) Global ( 37.71, 60.00, 3.36) +TGeoCompositeShape 18 Local ( 11.48, 30.00, -45.71) Global ( 41.48, 60.00, 4.29) +TGeoCompositeShape 19 Local ( 15.14, 30.00, -44.42) Global ( 45.14, 60.00, 5.58) +TGeoCompositeShape 20 Local ( 18.65, 30.00, -42.78) Global ( 48.65, 60.00, 7.22) +TGeoCompositeShape 21 Local ( 21.99, 30.00, -40.81) Global ( 51.99, 60.00, 9.19) +TGeoCompositeShape 22 Local ( 25.13, 30.00, -38.52) Global ( 55.13, 60.00, 11.48) +TGeoCompositeShape 23 Local ( 28.02, 30.00, -35.94) Global ( 58.02, 60.00, 14.06) +TGeoCompositeShape 24 Local ( 30.66, 30.00, -33.09) Global ( 60.66, 60.00, 16.91) +TGeoCompositeShape 25 Local ( -30.66, -30.00, -33.09) Global ( -0.66, 0.00, 16.91) +TGeoCompositeShape 26 Local ( -28.02, -30.00, -35.94) Global ( 1.98, 0.00, 14.06) +TGeoCompositeShape 27 Local ( -25.13, -30.00, -38.52) Global ( 4.87, 0.00, 11.48) +TGeoCompositeShape 28 Local ( -21.99, -30.00, -40.81) Global ( 8.01, 0.00, 9.19) +TGeoCompositeShape 29 Local ( -18.65, -30.00, -42.78) Global ( 11.35, 0.00, 7.22) +TGeoCompositeShape 30 Local ( -15.14, -30.00, -44.42) Global ( 14.86, 0.00, 5.58) +TGeoCompositeShape 31 Local ( -11.48, -30.00, -45.71) Global ( 18.52, 0.00, 4.29) +TGeoCompositeShape 32 Local ( -7.71, -30.00, -46.64) Global ( 22.29, 0.00, 3.36) +TGeoCompositeShape 33 Local ( -3.87, -30.00, -47.21) Global ( 26.13, 0.00, 2.79) +TGeoCompositeShape 34 Local ( 0.00, -30.00, -47.39) Global ( 30.00, 0.00, 2.61) +TGeoCompositeShape 35 Local ( 3.87, -30.00, -47.21) Global ( 33.87, 0.00, 2.79) +TGeoCompositeShape 36 Local ( 7.71, -30.00, -46.64) Global ( 37.71, 0.00, 3.36) +TGeoCompositeShape 37 Local ( 11.48, -30.00, -45.71) Global ( 41.48, 0.00, 4.29) +TGeoCompositeShape 38 Local ( 15.14, -30.00, -44.42) Global ( 45.14, 0.00, 5.58) +TGeoCompositeShape 39 Local ( 18.65, -30.00, -42.78) Global ( 48.65, 0.00, 7.22) +TGeoCompositeShape 40 Local ( 21.99, -30.00, -40.81) Global ( 51.99, 0.00, 9.19) +TGeoCompositeShape 41 Local ( 25.13, -30.00, -38.52) Global ( 55.13, 0.00, 11.48) +TGeoCompositeShape 42 Local ( 28.02, -30.00, -35.94) Global ( 58.02, 0.00, 14.06) +TGeoCompositeShape 43 Local ( 30.66, -30.00, -33.09) Global ( 60.66, 0.00, 16.91) +TGeoCompositeShape Bounding box: dx= 33.00 dy= 30.00 dz= 38.70 Origin: x= 0.00 y= 0.00 z= -8.70 ShapeCheck[1] TGeoCompositeShape 45 Mesh-points: TGeoCompositeShape PseudoTrap N(mesh)=45 N(vert)=45 N(seg)=0 N(pols)=0 TGeoCompositeShape 0 Local ( -3.00, -30.00, -30.00) Global ( 27.00, 0.00, -80.00) diff --git a/examples/ClientTests/ref/Ref_PseudoTrap1.txt b/examples/ClientTests/ref/Ref_PseudoTrap1.txt index ae6060019f51a6986a7dcfc216cabf58c6b30de2..f976ea5101a9a190774f2134338d715a47a0d204 100644 --- a/examples/ClientTests/ref/Ref_PseudoTrap1.txt +++ b/examples/ClientTests/ref/Ref_PseudoTrap1.txt @@ -1,9 +1,51 @@ -ShapeCheck[0] TGeoCompositeShape 6 Mesh-points: -TGeoCompositeShape PseudoTrap N(mesh)=6 N(vert)=6 N(seg)=0 N(pols)=0 -TGeoCompositeShape 0 Local ( 50.00, 30.00, -92.93) Global ( 50.00, 30.00, -92.93) -TGeoCompositeShape 1 Local ( 50.00, -30.00, -92.93) Global ( 50.00, -30.00, -92.93) -TGeoCompositeShape 2 Local (-186.36, -30.00, 92.93) Global (-186.36, -30.00, 92.93) -TGeoCompositeShape 3 Local (-186.36, 30.00, 92.93) Global (-186.36, 30.00, 92.93) -TGeoCompositeShape 4 Local ( 186.36, 30.00, 92.93) Global ( 186.36, 30.00, 92.93) -TGeoCompositeShape 5 Local ( 186.36, -30.00, 92.93) Global ( 186.36, -30.00, 92.93) -TGeoCompositeShape Bounding box: dx= 186.36 dy= 30.00 dz= 92.93 Origin: x= 0.00 y= 0.00 z= 0.00 +ShapeCheck[0] TGeoCompositeShape 48 Mesh-points: +TGeoCompositeShape PseudoTrap N(mesh)=48 N(vert)=48 N(seg)=0 N(pols)=0 +TGeoCompositeShape 0 Local ( -50.00, -30.00, -92.93) Global ( -50.00, -30.00, -92.93) +TGeoCompositeShape 1 Local ( -50.00, 30.00, -92.93) Global ( -50.00, 30.00, -92.93) +TGeoCompositeShape 2 Local ( 50.00, 30.00, -92.93) Global ( 50.00, 30.00, -92.93) +TGeoCompositeShape 3 Local ( 50.00, -30.00, -92.93) Global ( 50.00, -30.00, -92.93) +TGeoCompositeShape 4 Local (-186.36, -30.00, 92.93) Global (-186.36, -30.00, 92.93) +TGeoCompositeShape 5 Local (-186.36, 30.00, 92.93) Global (-186.36, 30.00, 92.93) +TGeoCompositeShape 6 Local ( 186.36, 30.00, 92.93) Global ( 186.36, 30.00, 92.93) +TGeoCompositeShape 7 Local ( 186.36, -30.00, 92.93) Global ( 186.36, -30.00, 92.93) +TGeoCompositeShape 8 Local ( -45.49, 30.00, -95.70) Global ( -45.49, 30.00, -95.70) +TGeoCompositeShape 9 Local ( -40.83, 30.00, -98.20) Global ( -40.83, 30.00, -98.20) +TGeoCompositeShape 10 Local ( -36.03, 30.00, -100.43) Global ( -36.03, 30.00, -100.43) +TGeoCompositeShape 11 Local ( -31.11, 30.00, -102.37) Global ( -31.11, 30.00, -102.37) +TGeoCompositeShape 12 Local ( -26.09, 30.00, -104.03) Global ( -26.09, 30.00, -104.03) +TGeoCompositeShape 13 Local ( -20.97, 30.00, -105.39) Global ( -20.97, 30.00, -105.39) +TGeoCompositeShape 14 Local ( -15.79, 30.00, -106.46) Global ( -15.79, 30.00, -106.46) +TGeoCompositeShape 15 Local ( -10.56, 30.00, -107.22) Global ( -10.56, 30.00, -107.22) +TGeoCompositeShape 16 Local ( -5.29, 30.00, -107.68) Global ( -5.29, 30.00, -107.68) +TGeoCompositeShape 17 Local ( 0.00, 30.00, -107.83) Global ( 0.00, 30.00, -107.83) +TGeoCompositeShape 18 Local ( 5.29, 30.00, -107.68) Global ( 5.29, 30.00, -107.68) +TGeoCompositeShape 19 Local ( 10.56, 30.00, -107.22) Global ( 10.56, 30.00, -107.22) +TGeoCompositeShape 20 Local ( 15.79, 30.00, -106.46) Global ( 15.79, 30.00, -106.46) +TGeoCompositeShape 21 Local ( 20.97, 30.00, -105.39) Global ( 20.97, 30.00, -105.39) +TGeoCompositeShape 22 Local ( 26.09, 30.00, -104.03) Global ( 26.09, 30.00, -104.03) +TGeoCompositeShape 23 Local ( 31.11, 30.00, -102.37) Global ( 31.11, 30.00, -102.37) +TGeoCompositeShape 24 Local ( 36.03, 30.00, -100.43) Global ( 36.03, 30.00, -100.43) +TGeoCompositeShape 25 Local ( 40.83, 30.00, -98.20) Global ( 40.83, 30.00, -98.20) +TGeoCompositeShape 26 Local ( 45.49, 30.00, -95.70) Global ( 45.49, 30.00, -95.70) +TGeoCompositeShape 27 Local ( 50.00, 30.00, -92.93) Global ( 50.00, 30.00, -92.93) +TGeoCompositeShape 28 Local ( -45.49, -30.00, -95.70) Global ( -45.49, -30.00, -95.70) +TGeoCompositeShape 29 Local ( -40.83, -30.00, -98.20) Global ( -40.83, -30.00, -98.20) +TGeoCompositeShape 30 Local ( -36.03, -30.00, -100.43) Global ( -36.03, -30.00, -100.43) +TGeoCompositeShape 31 Local ( -31.11, -30.00, -102.37) Global ( -31.11, -30.00, -102.37) +TGeoCompositeShape 32 Local ( -26.09, -30.00, -104.03) Global ( -26.09, -30.00, -104.03) +TGeoCompositeShape 33 Local ( -20.97, -30.00, -105.39) Global ( -20.97, -30.00, -105.39) +TGeoCompositeShape 34 Local ( -15.79, -30.00, -106.46) Global ( -15.79, -30.00, -106.46) +TGeoCompositeShape 35 Local ( -10.56, -30.00, -107.22) Global ( -10.56, -30.00, -107.22) +TGeoCompositeShape 36 Local ( -5.29, -30.00, -107.68) Global ( -5.29, -30.00, -107.68) +TGeoCompositeShape 37 Local ( 0.00, -30.00, -107.83) Global ( 0.00, -30.00, -107.83) +TGeoCompositeShape 38 Local ( 5.29, -30.00, -107.68) Global ( 5.29, -30.00, -107.68) +TGeoCompositeShape 39 Local ( 10.56, -30.00, -107.22) Global ( 10.56, -30.00, -107.22) +TGeoCompositeShape 40 Local ( 15.79, -30.00, -106.46) Global ( 15.79, -30.00, -106.46) +TGeoCompositeShape 41 Local ( 20.97, -30.00, -105.39) Global ( 20.97, -30.00, -105.39) +TGeoCompositeShape 42 Local ( 26.09, -30.00, -104.03) Global ( 26.09, -30.00, -104.03) +TGeoCompositeShape 43 Local ( 31.11, -30.00, -102.37) Global ( 31.11, -30.00, -102.37) +TGeoCompositeShape 44 Local ( 36.03, -30.00, -100.43) Global ( 36.03, -30.00, -100.43) +TGeoCompositeShape 45 Local ( 40.83, -30.00, -98.20) Global ( 40.83, -30.00, -98.20) +TGeoCompositeShape 46 Local ( 45.49, -30.00, -95.70) Global ( 45.49, -30.00, -95.70) +TGeoCompositeShape 47 Local ( 50.00, -30.00, -92.93) Global ( 50.00, -30.00, -92.93) +TGeoCompositeShape Bounding box: dx= 186.36 dy= 30.00 dz= 100.38 Origin: x= 0.00 y= 0.00 z= -7.45 diff --git a/examples/ClientTests/ref/Ref_Scaled_Cone.txt b/examples/ClientTests/ref/Ref_Scaled_Cone.txt index 657f1da39d9c442133a3eb4c95384896a9d430f5..926ecab3bb6e84f17a073a68a874d03654ce3590 100644 --- a/examples/ClientTests/ref/Ref_Scaled_Cone.txt +++ b/examples/ClientTests/ref/Ref_Scaled_Cone.txt @@ -15,7 +15,7 @@ TGeoScaledShape 11 Local ( -4.76, -0.46, -40.00) Global ( -4.76, -4.45 TGeoScaledShape 12 Local ( -4.05, -0.88, -40.00) Global ( -4.05, -4.87, 10.29) TGeoScaledShape 13 Local ( -2.94, -1.21, -40.00) Global ( -2.94, -5.20, 10.32) TGeoScaledShape 14 Local ( -1.55, -1.43, -40.00) Global ( -1.55, -5.41, 10.34) -TGeoScaledShape 15 Local ( -0.00, -1.50, -40.00) Global ( -0.00, -5.49, 10.35) +TGeoScaledShape 15 Local ( 0.00, -1.50, -40.00) Global ( 0.00, -5.49, 10.35) TGeoScaledShape 16 Local ( 1.55, -1.43, -40.00) Global ( 1.55, -5.41, 10.34) TGeoScaledShape 17 Local ( 2.94, -1.21, -40.00) Global ( 2.94, -5.20, 10.32) TGeoScaledShape 18 Local ( 4.05, -0.88, -40.00) Global ( 4.05, -4.87, 10.29) @@ -35,7 +35,7 @@ TGeoScaledShape 31 Local ( -28.53, -2.78, -40.00) Global ( -28.53, -6.76 TGeoScaledShape 32 Local ( -24.27, -5.29, -40.00) Global ( -24.27, -9.26, 10.73) TGeoScaledShape 33 Local ( -17.63, -7.28, -40.00) Global ( -17.63, -11.24, 10.93) TGeoScaledShape 34 Local ( -9.27, -8.56, -40.00) Global ( -9.27, -12.51, 11.05) -TGeoScaledShape 35 Local ( -0.00, -9.00, -40.00) Global ( -0.00, -12.95, 11.10) +TGeoScaledShape 35 Local ( 0.00, -9.00, -40.00) Global ( 0.00, -12.95, 11.10) TGeoScaledShape 36 Local ( 9.27, -8.56, -40.00) Global ( 9.27, -12.51, 11.05) TGeoScaledShape 37 Local ( 17.63, -7.28, -40.00) Global ( 17.63, -11.24, 10.93) TGeoScaledShape 38 Local ( 24.27, -5.29, -40.00) Global ( 24.27, -9.26, 10.73) @@ -55,7 +55,7 @@ TGeoScaledShape 51 Local ( -19.02, -1.85, 40.00) Global ( -19.02, 2.15 TGeoScaledShape 52 Local ( -16.18, -3.53, 40.00) Global ( -16.18, 0.48, 90.15) TGeoScaledShape 53 Local ( -11.76, -4.85, 40.00) Global ( -11.76, -0.84, 90.28) TGeoScaledShape 54 Local ( -6.18, -5.71, 40.00) Global ( -6.18, -1.68, 90.37) -TGeoScaledShape 55 Local ( -0.00, -6.00, 40.00) Global ( -0.00, -1.98, 90.40) +TGeoScaledShape 55 Local ( 0.00, -6.00, 40.00) Global ( 0.00, -1.98, 90.40) TGeoScaledShape 56 Local ( 6.18, -5.71, 40.00) Global ( 6.18, -1.68, 90.37) TGeoScaledShape 57 Local ( 11.76, -4.85, 40.00) Global ( 11.76, -0.84, 90.28) TGeoScaledShape 58 Local ( 16.18, -3.53, 40.00) Global ( 16.18, 0.48, 90.15) @@ -75,7 +75,7 @@ TGeoScaledShape 71 Local ( -85.60, -8.34, 40.00) Global ( -85.60, -4.31 TGeoScaledShape 72 Local ( -72.81, -15.87, 40.00) Global ( -72.81, -11.80, 91.38) TGeoScaledShape 73 Local ( -52.90, -21.84, 40.00) Global ( -52.90, -17.74, 91.98) TGeoScaledShape 74 Local ( -27.81, -25.68, 40.00) Global ( -27.81, -21.56, 92.36) -TGeoScaledShape 75 Local ( -0.00, -27.00, 40.00) Global ( -0.00, -22.87, 92.50) +TGeoScaledShape 75 Local ( 0.00, -27.00, 40.00) Global ( 0.00, -22.87, 92.50) TGeoScaledShape 76 Local ( 27.81, -25.68, 40.00) Global ( 27.81, -21.56, 92.36) TGeoScaledShape 77 Local ( 52.90, -21.84, 40.00) Global ( 52.90, -17.74, 91.98) TGeoScaledShape 78 Local ( 72.81, -15.87, 40.00) Global ( 72.81, -11.80, 91.38) @@ -98,7 +98,7 @@ TGeoScaledShape 11 Local ( -2.85, -0.62, -40.00) Global ( -2.85, -16.68 TGeoScaledShape 12 Local ( -2.43, -1.18, -40.00) Global ( -2.43, -16.98, -22.60) TGeoScaledShape 13 Local ( -1.76, -1.62, -40.00) Global ( -1.76, -17.22, -22.97) TGeoScaledShape 14 Local ( -0.93, -1.90, -40.00) Global ( -0.93, -17.37, -23.21) -TGeoScaledShape 15 Local ( -0.00, -2.00, -40.00) Global ( -0.00, -17.42, -23.30) +TGeoScaledShape 15 Local ( 0.00, -2.00, -40.00) Global ( 0.00, -17.42, -23.30) TGeoScaledShape 16 Local ( 0.93, -1.90, -40.00) Global ( 0.93, -17.37, -23.21) TGeoScaledShape 17 Local ( 1.76, -1.62, -40.00) Global ( 1.76, -17.22, -22.97) TGeoScaledShape 18 Local ( 2.43, -1.18, -40.00) Global ( 2.43, -16.98, -22.60) @@ -118,7 +118,7 @@ TGeoScaledShape 31 Local ( -17.12, -3.71, -40.00) Global ( -17.12, -18.34 TGeoScaledShape 32 Local ( -14.56, -7.05, -40.00) Global ( -14.56, -20.15, -27.55) TGeoScaledShape 33 Local ( -10.58, -9.71, -40.00) Global ( -10.58, -21.59, -29.78) TGeoScaledShape 34 Local ( -5.56, -11.41, -40.00) Global ( -5.56, -22.51, -31.22) -TGeoScaledShape 35 Local ( -0.00, -12.00, -40.00) Global ( -0.00, -22.82, -31.71) +TGeoScaledShape 35 Local ( 0.00, -12.00, -40.00) Global ( 0.00, -22.82, -31.71) TGeoScaledShape 36 Local ( 5.56, -11.41, -40.00) Global ( 5.56, -22.51, -31.22) TGeoScaledShape 37 Local ( 10.58, -9.71, -40.00) Global ( 10.58, -21.59, -29.78) TGeoScaledShape 38 Local ( 14.56, -7.05, -40.00) Global ( 14.56, -20.15, -27.55) @@ -138,7 +138,7 @@ TGeoScaledShape 51 Local ( -11.41, -2.47, 40.00) Global ( -11.41, -84.99 TGeoScaledShape 52 Local ( -9.71, -4.70, 40.00) Global ( -9.71, -86.20, 17.66) TGeoScaledShape 53 Local ( -7.05, -6.47, 40.00) Global ( -7.05, -87.16, 16.17) TGeoScaledShape 54 Local ( -3.71, -7.61, 40.00) Global ( -3.71, -87.77, 15.21) -TGeoScaledShape 55 Local ( -0.00, -8.00, 40.00) Global ( -0.00, -87.98, 14.88) +TGeoScaledShape 55 Local ( 0.00, -8.00, 40.00) Global ( 0.00, -87.98, 14.88) TGeoScaledShape 56 Local ( 3.71, -7.61, 40.00) Global ( 3.71, -87.77, 15.21) TGeoScaledShape 57 Local ( 7.05, -6.47, 40.00) Global ( 7.05, -87.16, 16.17) TGeoScaledShape 58 Local ( 9.71, -4.70, 40.00) Global ( 9.71, -86.20, 17.66) @@ -158,7 +158,7 @@ TGeoScaledShape 71 Local ( -51.36, -11.12, 40.00) Global ( -51.36, -89.67 TGeoScaledShape 72 Local ( -43.69, -21.16, 40.00) Global ( -43.69, -95.09, 3.81) TGeoScaledShape 73 Local ( -31.74, -29.12, 40.00) Global ( -31.74, -99.39, -2.90) TGeoScaledShape 74 Local ( -16.69, -34.24, 40.00) Global ( -16.69, -102.16, -7.20) -TGeoScaledShape 75 Local ( -0.00, -36.00, 40.00) Global ( -0.00, -103.11, -8.68) +TGeoScaledShape 75 Local ( 0.00, -36.00, 40.00) Global ( 0.00, -103.11, -8.68) TGeoScaledShape 76 Local ( 16.69, -34.24, 40.00) Global ( 16.69, -102.16, -7.20) TGeoScaledShape 77 Local ( 31.74, -29.12, 40.00) Global ( 31.74, -99.39, -2.90) TGeoScaledShape 78 Local ( 43.69, -21.16, 40.00) Global ( 43.69, -95.09, 3.81) diff --git a/examples/ClientTests/ref/Ref_Torus.txt b/examples/ClientTests/ref/Ref_Torus.txt index d6350b9b35d8c5a6b65bd0b53f9daef3e03c36b6..5acbd736347308d856719b98493350b711a5472e 100644 --- a/examples/ClientTests/ref/Ref_Torus.txt +++ b/examples/ClientTests/ref/Ref_Torus.txt @@ -300,26 +300,26 @@ TGeoTorus 296 Local ( -18.32, -56.37, -28.53) Global ( 11.68, -26.37 TGeoTorus 297 Local ( -20.90, -64.32, -24.27) Global ( 9.10, -34.32, 5.73) TGeoTorus 298 Local ( -22.95, -70.64, -17.63) Global ( 7.05, -40.64, 12.37) TGeoTorus 299 Local ( -24.27, -74.69, -9.27) Global ( 5.73, -44.69, 20.73) -TGeoTorus 300 Local ( -0.00, -80.00, 0.00) Global ( 30.00, -50.00, 30.00) -TGeoTorus 301 Local ( -0.00, -78.53, 9.27) Global ( 30.00, -48.53, 39.27) -TGeoTorus 302 Local ( -0.00, -74.27, 17.63) Global ( 30.00, -44.27, 47.63) -TGeoTorus 303 Local ( -0.00, -67.63, 24.27) Global ( 30.00, -37.63, 54.27) -TGeoTorus 304 Local ( -0.00, -59.27, 28.53) Global ( 30.00, -29.27, 58.53) -TGeoTorus 305 Local ( -0.00, -50.00, 30.00) Global ( 30.00, -20.00, 60.00) -TGeoTorus 306 Local ( -0.00, -40.73, 28.53) Global ( 30.00, -10.73, 58.53) -TGeoTorus 307 Local ( -0.00, -32.37, 24.27) Global ( 30.00, -2.37, 54.27) -TGeoTorus 308 Local ( -0.00, -25.73, 17.63) Global ( 30.00, 4.27, 47.63) -TGeoTorus 309 Local ( -0.00, -21.47, 9.27) Global ( 30.00, 8.53, 39.27) -TGeoTorus 310 Local ( -0.00, -20.00, 0.00) Global ( 30.00, 10.00, 30.00) -TGeoTorus 311 Local ( -0.00, -21.47, -9.27) Global ( 30.00, 8.53, 20.73) -TGeoTorus 312 Local ( -0.00, -25.73, -17.63) Global ( 30.00, 4.27, 12.37) -TGeoTorus 313 Local ( -0.00, -32.37, -24.27) Global ( 30.00, -2.37, 5.73) -TGeoTorus 314 Local ( -0.00, -40.73, -28.53) Global ( 30.00, -10.73, 1.47) -TGeoTorus 315 Local ( -0.00, -50.00, -30.00) Global ( 30.00, -20.00, 0.00) -TGeoTorus 316 Local ( -0.00, -59.27, -28.53) Global ( 30.00, -29.27, 1.47) -TGeoTorus 317 Local ( -0.00, -67.63, -24.27) Global ( 30.00, -37.63, 5.73) -TGeoTorus 318 Local ( -0.00, -74.27, -17.63) Global ( 30.00, -44.27, 12.37) -TGeoTorus 319 Local ( -0.00, -78.53, -9.27) Global ( 30.00, -48.53, 20.73) +TGeoTorus 300 Local ( 0.00, -80.00, 0.00) Global ( 30.00, -50.00, 30.00) +TGeoTorus 301 Local ( 0.00, -78.53, 9.27) Global ( 30.00, -48.53, 39.27) +TGeoTorus 302 Local ( 0.00, -74.27, 17.63) Global ( 30.00, -44.27, 47.63) +TGeoTorus 303 Local ( 0.00, -67.63, 24.27) Global ( 30.00, -37.63, 54.27) +TGeoTorus 304 Local ( 0.00, -59.27, 28.53) Global ( 30.00, -29.27, 58.53) +TGeoTorus 305 Local ( 0.00, -50.00, 30.00) Global ( 30.00, -20.00, 60.00) +TGeoTorus 306 Local ( 0.00, -40.73, 28.53) Global ( 30.00, -10.73, 58.53) +TGeoTorus 307 Local ( 0.00, -32.37, 24.27) Global ( 30.00, -2.37, 54.27) +TGeoTorus 308 Local ( 0.00, -25.73, 17.63) Global ( 30.00, 4.27, 47.63) +TGeoTorus 309 Local ( 0.00, -21.47, 9.27) Global ( 30.00, 8.53, 39.27) +TGeoTorus 310 Local ( 0.00, -20.00, 0.00) Global ( 30.00, 10.00, 30.00) +TGeoTorus 311 Local ( 0.00, -21.47, -9.27) Global ( 30.00, 8.53, 20.73) +TGeoTorus 312 Local ( 0.00, -25.73, -17.63) Global ( 30.00, 4.27, 12.37) +TGeoTorus 313 Local ( 0.00, -32.37, -24.27) Global ( 30.00, -2.37, 5.73) +TGeoTorus 314 Local ( 0.00, -40.73, -28.53) Global ( 30.00, -10.73, 1.47) +TGeoTorus 315 Local ( 0.00, -50.00, -30.00) Global ( 30.00, -20.00, 0.00) +TGeoTorus 316 Local ( 0.00, -59.27, -28.53) Global ( 30.00, -29.27, 1.47) +TGeoTorus 317 Local ( 0.00, -67.63, -24.27) Global ( 30.00, -37.63, 5.73) +TGeoTorus 318 Local ( 0.00, -74.27, -17.63) Global ( 30.00, -44.27, 12.37) +TGeoTorus 319 Local ( 0.00, -78.53, -9.27) Global ( 30.00, -48.53, 20.73) TGeoTorus 320 Local ( 24.72, -76.08, 0.00) Global ( 54.72, -46.08, 30.00) TGeoTorus 321 Local ( 24.27, -74.69, 9.27) Global ( 54.27, -44.69, 39.27) TGeoTorus 322 Local ( 22.95, -70.64, 17.63) Global ( 52.95, -40.64, 47.63) @@ -400,26 +400,26 @@ TGeoTorus 396 Local ( 56.37, -18.32, -28.53) Global ( 86.37, 11.68 TGeoTorus 397 Local ( 64.32, -20.90, -24.27) Global ( 94.32, 9.10, 5.73) TGeoTorus 398 Local ( 70.64, -22.95, -17.63) Global ( 100.64, 7.05, 12.37) TGeoTorus 399 Local ( 74.69, -24.27, -9.27) Global ( 104.69, 5.73, 20.73) -TGeoTorus 400 Local ( 80.00, -0.00, 0.00) Global ( 110.00, 30.00, 30.00) -TGeoTorus 401 Local ( 78.53, -0.00, 9.27) Global ( 108.53, 30.00, 39.27) -TGeoTorus 402 Local ( 74.27, -0.00, 17.63) Global ( 104.27, 30.00, 47.63) -TGeoTorus 403 Local ( 67.63, -0.00, 24.27) Global ( 97.63, 30.00, 54.27) -TGeoTorus 404 Local ( 59.27, -0.00, 28.53) Global ( 89.27, 30.00, 58.53) -TGeoTorus 405 Local ( 50.00, -0.00, 30.00) Global ( 80.00, 30.00, 60.00) -TGeoTorus 406 Local ( 40.73, -0.00, 28.53) Global ( 70.73, 30.00, 58.53) -TGeoTorus 407 Local ( 32.37, -0.00, 24.27) Global ( 62.37, 30.00, 54.27) -TGeoTorus 408 Local ( 25.73, -0.00, 17.63) Global ( 55.73, 30.00, 47.63) -TGeoTorus 409 Local ( 21.47, -0.00, 9.27) Global ( 51.47, 30.00, 39.27) -TGeoTorus 410 Local ( 20.00, -0.00, 0.00) Global ( 50.00, 30.00, 30.00) -TGeoTorus 411 Local ( 21.47, -0.00, -9.27) Global ( 51.47, 30.00, 20.73) -TGeoTorus 412 Local ( 25.73, -0.00, -17.63) Global ( 55.73, 30.00, 12.37) -TGeoTorus 413 Local ( 32.37, -0.00, -24.27) Global ( 62.37, 30.00, 5.73) -TGeoTorus 414 Local ( 40.73, -0.00, -28.53) Global ( 70.73, 30.00, 1.47) -TGeoTorus 415 Local ( 50.00, -0.00, -30.00) Global ( 80.00, 30.00, 0.00) -TGeoTorus 416 Local ( 59.27, -0.00, -28.53) Global ( 89.27, 30.00, 1.47) -TGeoTorus 417 Local ( 67.63, -0.00, -24.27) Global ( 97.63, 30.00, 5.73) -TGeoTorus 418 Local ( 74.27, -0.00, -17.63) Global ( 104.27, 30.00, 12.37) -TGeoTorus 419 Local ( 78.53, -0.00, -9.27) Global ( 108.53, 30.00, 20.73) +TGeoTorus 400 Local ( 80.00, 0.00, 0.00) Global ( 110.00, 30.00, 30.00) +TGeoTorus 401 Local ( 78.53, 0.00, 9.27) Global ( 108.53, 30.00, 39.27) +TGeoTorus 402 Local ( 74.27, 0.00, 17.63) Global ( 104.27, 30.00, 47.63) +TGeoTorus 403 Local ( 67.63, 0.00, 24.27) Global ( 97.63, 30.00, 54.27) +TGeoTorus 404 Local ( 59.27, 0.00, 28.53) Global ( 89.27, 30.00, 58.53) +TGeoTorus 405 Local ( 50.00, 0.00, 30.00) Global ( 80.00, 30.00, 60.00) +TGeoTorus 406 Local ( 40.73, 0.00, 28.53) Global ( 70.73, 30.00, 58.53) +TGeoTorus 407 Local ( 32.37, 0.00, 24.27) Global ( 62.37, 30.00, 54.27) +TGeoTorus 408 Local ( 25.73, 0.00, 17.63) Global ( 55.73, 30.00, 47.63) +TGeoTorus 409 Local ( 21.47, 0.00, 9.27) Global ( 51.47, 30.00, 39.27) +TGeoTorus 410 Local ( 20.00, 0.00, 0.00) Global ( 50.00, 30.00, 30.00) +TGeoTorus 411 Local ( 21.47, 0.00, -9.27) Global ( 51.47, 30.00, 20.73) +TGeoTorus 412 Local ( 25.73, 0.00, -17.63) Global ( 55.73, 30.00, 12.37) +TGeoTorus 413 Local ( 32.37, 0.00, -24.27) Global ( 62.37, 30.00, 5.73) +TGeoTorus 414 Local ( 40.73, 0.00, -28.53) Global ( 70.73, 30.00, 1.47) +TGeoTorus 415 Local ( 50.00, 0.00, -30.00) Global ( 80.00, 30.00, 0.00) +TGeoTorus 416 Local ( 59.27, 0.00, -28.53) Global ( 89.27, 30.00, 1.47) +TGeoTorus 417 Local ( 67.63, 0.00, -24.27) Global ( 97.63, 30.00, 5.73) +TGeoTorus 418 Local ( 74.27, 0.00, -17.63) Global ( 104.27, 30.00, 12.37) +TGeoTorus 419 Local ( 78.53, 0.00, -9.27) Global ( 108.53, 30.00, 20.73) TGeoTorus 420 Local ( 60.00, 0.00, 0.00) Global ( 90.00, 30.00, 30.00) TGeoTorus 421 Local ( 59.51, 0.00, 3.09) Global ( 89.51, 30.00, 33.09) TGeoTorus 422 Local ( 58.09, 0.00, 5.88) Global ( 88.09, 30.00, 35.88) @@ -720,26 +720,26 @@ TGeoTorus 716 Local ( -16.41, -50.49, -9.51) Global ( 13.59, -20.49 TGeoTorus 717 Local ( -17.27, -53.14, -8.09) Global ( 12.73, -23.14, 21.91) TGeoTorus 718 Local ( -17.95, -55.25, -5.88) Global ( 12.05, -25.25, 24.12) TGeoTorus 719 Local ( -18.39, -56.60, -3.09) Global ( 11.61, -26.60, 26.91) -TGeoTorus 720 Local ( -0.00, -60.00, 0.00) Global ( 30.00, -30.00, 30.00) -TGeoTorus 721 Local ( -0.00, -59.51, 3.09) Global ( 30.00, -29.51, 33.09) -TGeoTorus 722 Local ( -0.00, -58.09, 5.88) Global ( 30.00, -28.09, 35.88) -TGeoTorus 723 Local ( -0.00, -55.88, 8.09) Global ( 30.00, -25.88, 38.09) -TGeoTorus 724 Local ( -0.00, -53.09, 9.51) Global ( 30.00, -23.09, 39.51) -TGeoTorus 725 Local ( -0.00, -50.00, 10.00) Global ( 30.00, -20.00, 40.00) -TGeoTorus 726 Local ( -0.00, -46.91, 9.51) Global ( 30.00, -16.91, 39.51) -TGeoTorus 727 Local ( -0.00, -44.12, 8.09) Global ( 30.00, -14.12, 38.09) -TGeoTorus 728 Local ( -0.00, -41.91, 5.88) Global ( 30.00, -11.91, 35.88) -TGeoTorus 729 Local ( -0.00, -40.49, 3.09) Global ( 30.00, -10.49, 33.09) -TGeoTorus 730 Local ( -0.00, -40.00, 0.00) Global ( 30.00, -10.00, 30.00) -TGeoTorus 731 Local ( -0.00, -40.49, -3.09) Global ( 30.00, -10.49, 26.91) -TGeoTorus 732 Local ( -0.00, -41.91, -5.88) Global ( 30.00, -11.91, 24.12) -TGeoTorus 733 Local ( -0.00, -44.12, -8.09) Global ( 30.00, -14.12, 21.91) -TGeoTorus 734 Local ( -0.00, -46.91, -9.51) Global ( 30.00, -16.91, 20.49) -TGeoTorus 735 Local ( -0.00, -50.00, -10.00) Global ( 30.00, -20.00, 20.00) -TGeoTorus 736 Local ( -0.00, -53.09, -9.51) Global ( 30.00, -23.09, 20.49) -TGeoTorus 737 Local ( -0.00, -55.88, -8.09) Global ( 30.00, -25.88, 21.91) -TGeoTorus 738 Local ( -0.00, -58.09, -5.88) Global ( 30.00, -28.09, 24.12) -TGeoTorus 739 Local ( -0.00, -59.51, -3.09) Global ( 30.00, -29.51, 26.91) +TGeoTorus 720 Local ( 0.00, -60.00, 0.00) Global ( 30.00, -30.00, 30.00) +TGeoTorus 721 Local ( 0.00, -59.51, 3.09) Global ( 30.00, -29.51, 33.09) +TGeoTorus 722 Local ( 0.00, -58.09, 5.88) Global ( 30.00, -28.09, 35.88) +TGeoTorus 723 Local ( 0.00, -55.88, 8.09) Global ( 30.00, -25.88, 38.09) +TGeoTorus 724 Local ( 0.00, -53.09, 9.51) Global ( 30.00, -23.09, 39.51) +TGeoTorus 725 Local ( 0.00, -50.00, 10.00) Global ( 30.00, -20.00, 40.00) +TGeoTorus 726 Local ( 0.00, -46.91, 9.51) Global ( 30.00, -16.91, 39.51) +TGeoTorus 727 Local ( 0.00, -44.12, 8.09) Global ( 30.00, -14.12, 38.09) +TGeoTorus 728 Local ( 0.00, -41.91, 5.88) Global ( 30.00, -11.91, 35.88) +TGeoTorus 729 Local ( 0.00, -40.49, 3.09) Global ( 30.00, -10.49, 33.09) +TGeoTorus 730 Local ( 0.00, -40.00, 0.00) Global ( 30.00, -10.00, 30.00) +TGeoTorus 731 Local ( 0.00, -40.49, -3.09) Global ( 30.00, -10.49, 26.91) +TGeoTorus 732 Local ( 0.00, -41.91, -5.88) Global ( 30.00, -11.91, 24.12) +TGeoTorus 733 Local ( 0.00, -44.12, -8.09) Global ( 30.00, -14.12, 21.91) +TGeoTorus 734 Local ( 0.00, -46.91, -9.51) Global ( 30.00, -16.91, 20.49) +TGeoTorus 735 Local ( 0.00, -50.00, -10.00) Global ( 30.00, -20.00, 20.00) +TGeoTorus 736 Local ( 0.00, -53.09, -9.51) Global ( 30.00, -23.09, 20.49) +TGeoTorus 737 Local ( 0.00, -55.88, -8.09) Global ( 30.00, -25.88, 21.91) +TGeoTorus 738 Local ( 0.00, -58.09, -5.88) Global ( 30.00, -28.09, 24.12) +TGeoTorus 739 Local ( 0.00, -59.51, -3.09) Global ( 30.00, -29.51, 26.91) TGeoTorus 740 Local ( 18.54, -57.06, 0.00) Global ( 48.54, -27.06, 30.00) TGeoTorus 741 Local ( 18.39, -56.60, 3.09) Global ( 48.39, -26.60, 33.09) TGeoTorus 742 Local ( 17.95, -55.25, 5.88) Global ( 47.95, -25.25, 35.88) @@ -820,24 +820,24 @@ TGeoTorus 816 Local ( 50.49, -16.41, -9.51) Global ( 80.49, 13.59 TGeoTorus 817 Local ( 53.14, -17.27, -8.09) Global ( 83.14, 12.73, 21.91) TGeoTorus 818 Local ( 55.25, -17.95, -5.88) Global ( 85.25, 12.05, 24.12) TGeoTorus 819 Local ( 56.60, -18.39, -3.09) Global ( 86.60, 11.61, 26.91) -TGeoTorus 820 Local ( 60.00, -0.00, 0.00) Global ( 90.00, 30.00, 30.00) -TGeoTorus 821 Local ( 59.51, -0.00, 3.09) Global ( 89.51, 30.00, 33.09) -TGeoTorus 822 Local ( 58.09, -0.00, 5.88) Global ( 88.09, 30.00, 35.88) -TGeoTorus 823 Local ( 55.88, -0.00, 8.09) Global ( 85.88, 30.00, 38.09) -TGeoTorus 824 Local ( 53.09, -0.00, 9.51) Global ( 83.09, 30.00, 39.51) -TGeoTorus 825 Local ( 50.00, -0.00, 10.00) Global ( 80.00, 30.00, 40.00) -TGeoTorus 826 Local ( 46.91, -0.00, 9.51) Global ( 76.91, 30.00, 39.51) -TGeoTorus 827 Local ( 44.12, -0.00, 8.09) Global ( 74.12, 30.00, 38.09) -TGeoTorus 828 Local ( 41.91, -0.00, 5.88) Global ( 71.91, 30.00, 35.88) -TGeoTorus 829 Local ( 40.49, -0.00, 3.09) Global ( 70.49, 30.00, 33.09) -TGeoTorus 830 Local ( 40.00, -0.00, 0.00) Global ( 70.00, 30.00, 30.00) -TGeoTorus 831 Local ( 40.49, -0.00, -3.09) Global ( 70.49, 30.00, 26.91) -TGeoTorus 832 Local ( 41.91, -0.00, -5.88) Global ( 71.91, 30.00, 24.12) -TGeoTorus 833 Local ( 44.12, -0.00, -8.09) Global ( 74.12, 30.00, 21.91) -TGeoTorus 834 Local ( 46.91, -0.00, -9.51) Global ( 76.91, 30.00, 20.49) -TGeoTorus 835 Local ( 50.00, -0.00, -10.00) Global ( 80.00, 30.00, 20.00) -TGeoTorus 836 Local ( 53.09, -0.00, -9.51) Global ( 83.09, 30.00, 20.49) -TGeoTorus 837 Local ( 55.88, -0.00, -8.09) Global ( 85.88, 30.00, 21.91) -TGeoTorus 838 Local ( 58.09, -0.00, -5.88) Global ( 88.09, 30.00, 24.12) -TGeoTorus 839 Local ( 59.51, -0.00, -3.09) Global ( 89.51, 30.00, 26.91) +TGeoTorus 820 Local ( 60.00, 0.00, 0.00) Global ( 90.00, 30.00, 30.00) +TGeoTorus 821 Local ( 59.51, 0.00, 3.09) Global ( 89.51, 30.00, 33.09) +TGeoTorus 822 Local ( 58.09, 0.00, 5.88) Global ( 88.09, 30.00, 35.88) +TGeoTorus 823 Local ( 55.88, 0.00, 8.09) Global ( 85.88, 30.00, 38.09) +TGeoTorus 824 Local ( 53.09, 0.00, 9.51) Global ( 83.09, 30.00, 39.51) +TGeoTorus 825 Local ( 50.00, 0.00, 10.00) Global ( 80.00, 30.00, 40.00) +TGeoTorus 826 Local ( 46.91, 0.00, 9.51) Global ( 76.91, 30.00, 39.51) +TGeoTorus 827 Local ( 44.12, 0.00, 8.09) Global ( 74.12, 30.00, 38.09) +TGeoTorus 828 Local ( 41.91, 0.00, 5.88) Global ( 71.91, 30.00, 35.88) +TGeoTorus 829 Local ( 40.49, 0.00, 3.09) Global ( 70.49, 30.00, 33.09) +TGeoTorus 830 Local ( 40.00, 0.00, 0.00) Global ( 70.00, 30.00, 30.00) +TGeoTorus 831 Local ( 40.49, 0.00, -3.09) Global ( 70.49, 30.00, 26.91) +TGeoTorus 832 Local ( 41.91, 0.00, -5.88) Global ( 71.91, 30.00, 24.12) +TGeoTorus 833 Local ( 44.12, 0.00, -8.09) Global ( 74.12, 30.00, 21.91) +TGeoTorus 834 Local ( 46.91, 0.00, -9.51) Global ( 76.91, 30.00, 20.49) +TGeoTorus 835 Local ( 50.00, 0.00, -10.00) Global ( 80.00, 30.00, 20.00) +TGeoTorus 836 Local ( 53.09, 0.00, -9.51) Global ( 83.09, 30.00, 20.49) +TGeoTorus 837 Local ( 55.88, 0.00, -8.09) Global ( 85.88, 30.00, 21.91) +TGeoTorus 838 Local ( 58.09, 0.00, -5.88) Global ( 88.09, 30.00, 24.12) +TGeoTorus 839 Local ( 59.51, 0.00, -3.09) Global ( 89.51, 30.00, 26.91) TGeoTorus Bounding box: dx= 80.00 dy= 80.00 dz= 30.00 Origin: x= 0.00 y= 0.00 z= 0.00 diff --git a/examples/ClientTests/ref/Ref_TruncatedTube.txt b/examples/ClientTests/ref/Ref_TruncatedTube.txt index 440d0d66a21df24f3e143dcc1950294908ce41cf..c3e4f0cc18833e9454077f055dbbea95f602f64e 100644 --- a/examples/ClientTests/ref/Ref_TruncatedTube.txt +++ b/examples/ClientTests/ref/Ref_TruncatedTube.txt @@ -1,47 +1,47 @@ ShapeCheck[0] TGeoCompositeShape 42 Mesh-points: TGeoCompositeShape TruncatedTube N(mesh)=42 N(vert)=42 N(seg)=0 N(pols)=0 -TGeoCompositeShape 0 Local ( 40.00, 0.00, -50.00) Global ( 40.00, 0.00, 50.00) -TGeoCompositeShape 1 Local ( 39.88, 3.14, -50.00) Global ( 39.88, 3.14, 50.00) -TGeoCompositeShape 2 Local ( 39.51, 6.26, -50.00) Global ( 39.51, 6.26, 50.00) -TGeoCompositeShape 3 Local ( 38.89, 9.34, -50.00) Global ( 38.89, 9.34, 50.00) -TGeoCompositeShape 4 Local ( 38.04, 12.36, -50.00) Global ( 38.04, 12.36, 50.00) -TGeoCompositeShape 5 Local ( 36.96, 15.31, -50.00) Global ( 36.96, 15.31, 50.00) -TGeoCompositeShape 6 Local ( 35.64, 18.16, -50.00) Global ( 35.64, 18.16, 50.00) -TGeoCompositeShape 7 Local ( 34.11, 20.90, -50.00) Global ( 34.11, 20.90, 50.00) -TGeoCompositeShape 8 Local ( 32.36, 23.51, -50.00) Global ( 32.36, 23.51, 50.00) -TGeoCompositeShape 9 Local ( 30.42, 25.98, -50.00) Global ( 30.42, 25.98, 50.00) -TGeoCompositeShape 10 Local ( 28.28, 28.28, -50.00) Global ( 28.28, 28.28, 50.00) -TGeoCompositeShape 11 Local ( 25.98, 30.42, -50.00) Global ( 25.98, 30.42, 50.00) -TGeoCompositeShape 12 Local ( 23.51, 32.36, -50.00) Global ( 23.51, 32.36, 50.00) -TGeoCompositeShape 13 Local ( 20.90, 34.11, -50.00) Global ( 20.90, 34.11, 50.00) -TGeoCompositeShape 14 Local ( 18.16, 35.64, -50.00) Global ( 18.16, 35.64, 50.00) -TGeoCompositeShape 15 Local ( 15.31, 36.96, -50.00) Global ( 15.31, 36.96, 50.00) -TGeoCompositeShape 16 Local ( 12.36, 38.04, -50.00) Global ( 12.36, 38.04, 50.00) -TGeoCompositeShape 17 Local ( 9.34, 38.89, -50.00) Global ( 9.34, 38.89, 50.00) -TGeoCompositeShape 18 Local ( 6.26, 39.51, -50.00) Global ( 6.26, 39.51, 50.00) -TGeoCompositeShape 19 Local ( 3.14, 39.88, -50.00) Global ( 3.14, 39.88, 50.00) -TGeoCompositeShape 20 Local ( 0.00, 40.00, -50.00) Global ( 0.00, 40.00, 50.00) -TGeoCompositeShape 21 Local ( 40.00, 0.00, 50.00) Global ( 40.00, 0.00, 150.00) -TGeoCompositeShape 22 Local ( 39.88, 3.14, 50.00) Global ( 39.88, 3.14, 150.00) -TGeoCompositeShape 23 Local ( 39.51, 6.26, 50.00) Global ( 39.51, 6.26, 150.00) -TGeoCompositeShape 24 Local ( 38.89, 9.34, 50.00) Global ( 38.89, 9.34, 150.00) -TGeoCompositeShape 25 Local ( 38.04, 12.36, 50.00) Global ( 38.04, 12.36, 150.00) -TGeoCompositeShape 26 Local ( 36.96, 15.31, 50.00) Global ( 36.96, 15.31, 150.00) -TGeoCompositeShape 27 Local ( 35.64, 18.16, 50.00) Global ( 35.64, 18.16, 150.00) -TGeoCompositeShape 28 Local ( 34.11, 20.90, 50.00) Global ( 34.11, 20.90, 150.00) -TGeoCompositeShape 29 Local ( 32.36, 23.51, 50.00) Global ( 32.36, 23.51, 150.00) -TGeoCompositeShape 30 Local ( 30.42, 25.98, 50.00) Global ( 30.42, 25.98, 150.00) -TGeoCompositeShape 31 Local ( 28.28, 28.28, 50.00) Global ( 28.28, 28.28, 150.00) -TGeoCompositeShape 32 Local ( 25.98, 30.42, 50.00) Global ( 25.98, 30.42, 150.00) -TGeoCompositeShape 33 Local ( 23.51, 32.36, 50.00) Global ( 23.51, 32.36, 150.00) -TGeoCompositeShape 34 Local ( 20.90, 34.11, 50.00) Global ( 20.90, 34.11, 150.00) -TGeoCompositeShape 35 Local ( 18.16, 35.64, 50.00) Global ( 18.16, 35.64, 150.00) -TGeoCompositeShape 36 Local ( 15.31, 36.96, 50.00) Global ( 15.31, 36.96, 150.00) -TGeoCompositeShape 37 Local ( 12.36, 38.04, 50.00) Global ( 12.36, 38.04, 150.00) -TGeoCompositeShape 38 Local ( 9.34, 38.89, 50.00) Global ( 9.34, 38.89, 150.00) -TGeoCompositeShape 39 Local ( 6.26, 39.51, 50.00) Global ( 6.26, 39.51, 150.00) -TGeoCompositeShape 40 Local ( 3.14, 39.88, 50.00) Global ( 3.14, 39.88, 150.00) -TGeoCompositeShape 41 Local ( 0.00, 40.00, 50.00) Global ( 0.00, 40.00, 150.00) +TGeoCompositeShape 0 Local ( 20.00, 0.00, -50.00) Global ( 20.00, 0.00, 50.00) +TGeoCompositeShape 1 Local ( 19.94, 1.57, -50.00) Global ( 19.94, 1.57, 50.00) +TGeoCompositeShape 2 Local ( 19.75, 3.13, -50.00) Global ( 19.75, 3.13, 50.00) +TGeoCompositeShape 3 Local ( 19.45, 4.67, -50.00) Global ( 19.45, 4.67, 50.00) +TGeoCompositeShape 4 Local ( 19.02, 6.18, -50.00) Global ( 19.02, 6.18, 50.00) +TGeoCompositeShape 5 Local ( 18.48, 7.65, -50.00) Global ( 18.48, 7.65, 50.00) +TGeoCompositeShape 6 Local ( 17.82, 9.08, -50.00) Global ( 17.82, 9.08, 50.00) +TGeoCompositeShape 7 Local ( 17.05, 10.45, -50.00) Global ( 17.05, 10.45, 50.00) +TGeoCompositeShape 8 Local ( 16.18, 11.76, -50.00) Global ( 16.18, 11.76, 50.00) +TGeoCompositeShape 9 Local ( 15.21, 12.99, -50.00) Global ( 15.21, 12.99, 50.00) +TGeoCompositeShape 10 Local ( 14.14, 14.14, -50.00) Global ( 14.14, 14.14, 50.00) +TGeoCompositeShape 11 Local ( 12.99, 15.21, -50.00) Global ( 12.99, 15.21, 50.00) +TGeoCompositeShape 12 Local ( 11.76, 16.18, -50.00) Global ( 11.76, 16.18, 50.00) +TGeoCompositeShape 13 Local ( 10.45, 17.05, -50.00) Global ( 10.45, 17.05, 50.00) +TGeoCompositeShape 14 Local ( 9.08, 17.82, -50.00) Global ( 9.08, 17.82, 50.00) +TGeoCompositeShape 15 Local ( 7.65, 18.48, -50.00) Global ( 7.65, 18.48, 50.00) +TGeoCompositeShape 16 Local ( 6.18, 19.02, -50.00) Global ( 6.18, 19.02, 50.00) +TGeoCompositeShape 17 Local ( 4.67, 19.45, -50.00) Global ( 4.67, 19.45, 50.00) +TGeoCompositeShape 18 Local ( 3.13, 19.75, -50.00) Global ( 3.13, 19.75, 50.00) +TGeoCompositeShape 19 Local ( 1.57, 19.94, -50.00) Global ( 1.57, 19.94, 50.00) +TGeoCompositeShape 20 Local ( 0.00, 20.00, -50.00) Global ( 0.00, 20.00, 50.00) +TGeoCompositeShape 21 Local ( 20.00, 0.00, 50.00) Global ( 20.00, 0.00, 150.00) +TGeoCompositeShape 22 Local ( 19.94, 1.57, 50.00) Global ( 19.94, 1.57, 150.00) +TGeoCompositeShape 23 Local ( 19.75, 3.13, 50.00) Global ( 19.75, 3.13, 150.00) +TGeoCompositeShape 24 Local ( 19.45, 4.67, 50.00) Global ( 19.45, 4.67, 150.00) +TGeoCompositeShape 25 Local ( 19.02, 6.18, 50.00) Global ( 19.02, 6.18, 150.00) +TGeoCompositeShape 26 Local ( 18.48, 7.65, 50.00) Global ( 18.48, 7.65, 150.00) +TGeoCompositeShape 27 Local ( 17.82, 9.08, 50.00) Global ( 17.82, 9.08, 150.00) +TGeoCompositeShape 28 Local ( 17.05, 10.45, 50.00) Global ( 17.05, 10.45, 150.00) +TGeoCompositeShape 29 Local ( 16.18, 11.76, 50.00) Global ( 16.18, 11.76, 150.00) +TGeoCompositeShape 30 Local ( 15.21, 12.99, 50.00) Global ( 15.21, 12.99, 150.00) +TGeoCompositeShape 31 Local ( 14.14, 14.14, 50.00) Global ( 14.14, 14.14, 150.00) +TGeoCompositeShape 32 Local ( 12.99, 15.21, 50.00) Global ( 12.99, 15.21, 150.00) +TGeoCompositeShape 33 Local ( 11.76, 16.18, 50.00) Global ( 11.76, 16.18, 150.00) +TGeoCompositeShape 34 Local ( 10.45, 17.05, 50.00) Global ( 10.45, 17.05, 150.00) +TGeoCompositeShape 35 Local ( 9.08, 17.82, 50.00) Global ( 9.08, 17.82, 150.00) +TGeoCompositeShape 36 Local ( 7.65, 18.48, 50.00) Global ( 7.65, 18.48, 150.00) +TGeoCompositeShape 37 Local ( 6.18, 19.02, 50.00) Global ( 6.18, 19.02, 150.00) +TGeoCompositeShape 38 Local ( 4.67, 19.45, 50.00) Global ( 4.67, 19.45, 150.00) +TGeoCompositeShape 39 Local ( 3.13, 19.75, 50.00) Global ( 3.13, 19.75, 150.00) +TGeoCompositeShape 40 Local ( 1.57, 19.94, 50.00) Global ( 1.57, 19.94, 150.00) +TGeoCompositeShape 41 Local ( 0.00, 20.00, 50.00) Global ( 0.00, 20.00, 150.00) TGeoCompositeShape Bounding box: dx= 20.00 dy= 20.00 dz= 50.00 Origin: x= 20.00 y= 20.00 z= 0.00 ShapeCheck[1] TGeoCompositeShape 42 Mesh-points: TGeoCompositeShape TruncatedTube N(mesh)=42 N(vert)=42 N(seg)=0 N(pols)=0 diff --git a/examples/ClientTests/ref/Ref_Tube.txt b/examples/ClientTests/ref/Ref_Tube.txt index c928de3e06838dee17841782c14f06604610de00..6b6e9838431dd56770b2bfffefd6f47f38a50497 100644 --- a/examples/ClientTests/ref/Ref_Tube.txt +++ b/examples/ClientTests/ref/Ref_Tube.txt @@ -15,12 +15,12 @@ TGeoTubeSeg 11 Local ( -9.51, -3.09, -50.00) Global ( -12.08, 26.91 TGeoTubeSeg 12 Local ( -8.09, -5.88, -50.00) Global ( -11.08, 24.12, 20.37) TGeoTubeSeg 13 Local ( -5.88, -8.09, -50.00) Global ( -9.51, 21.91, 18.80) TGeoTubeSeg 14 Local ( -3.09, -9.51, -50.00) Global ( -7.54, 20.49, 16.83) -TGeoTubeSeg 15 Local ( -0.00, -10.00, -50.00) Global ( -5.36, 20.00, 14.64) +TGeoTubeSeg 15 Local ( 0.00, -10.00, -50.00) Global ( -5.36, 20.00, 14.64) TGeoTubeSeg 16 Local ( 3.09, -9.51, -50.00) Global ( -3.17, 20.49, 12.46) TGeoTubeSeg 17 Local ( 5.88, -8.09, -50.00) Global ( -1.20, 21.91, 10.49) TGeoTubeSeg 18 Local ( 8.09, -5.88, -50.00) Global ( 0.37, 24.12, 8.92) TGeoTubeSeg 19 Local ( 9.51, -3.09, -50.00) Global ( 1.37, 26.91, 7.92) -TGeoTubeSeg 20 Local ( 10.00, -0.00, -50.00) Global ( 1.72, 30.00, 7.57) +TGeoTubeSeg 20 Local ( 10.00, 0.00, -50.00) Global ( 1.72, 30.00, 7.57) TGeoTubeSeg 21 Local ( 30.00, 0.00, -50.00) Global ( 15.86, 30.00, -6.57) TGeoTubeSeg 22 Local ( 28.53, 9.27, -50.00) Global ( 14.82, 39.27, -5.53) TGeoTubeSeg 23 Local ( 24.27, 17.63, -50.00) Global ( 11.81, 47.63, -2.52) @@ -36,12 +36,12 @@ TGeoTubeSeg 32 Local ( -28.53, -9.27, -50.00) Global ( -25.53, 20.73 TGeoTubeSeg 33 Local ( -24.27, -17.63, -50.00) Global ( -22.52, 12.37, 31.81) TGeoTubeSeg 34 Local ( -17.63, -24.27, -50.00) Global ( -17.82, 5.73, 27.11) TGeoTubeSeg 35 Local ( -9.27, -28.53, -50.00) Global ( -11.91, 1.47, 21.20) -TGeoTubeSeg 36 Local ( -0.00, -30.00, -50.00) Global ( -5.36, 0.00, 14.64) +TGeoTubeSeg 36 Local ( 0.00, -30.00, -50.00) Global ( -5.36, 0.00, 14.64) TGeoTubeSeg 37 Local ( 9.27, -28.53, -50.00) Global ( 1.20, 1.47, 8.09) TGeoTubeSeg 38 Local ( 17.63, -24.27, -50.00) Global ( 7.11, 5.73, 2.18) TGeoTubeSeg 39 Local ( 24.27, -17.63, -50.00) Global ( 11.81, 12.37, -2.52) TGeoTubeSeg 40 Local ( 28.53, -9.27, -50.00) Global ( 14.82, 20.73, -5.53) -TGeoTubeSeg 41 Local ( 30.00, -0.00, -50.00) Global ( 15.86, 30.00, -6.57) +TGeoTubeSeg 41 Local ( 30.00, 0.00, -50.00) Global ( 15.86, 30.00, -6.57) TGeoTubeSeg 42 Local ( 10.00, 0.00, 50.00) Global ( 72.43, 30.00, 78.28) TGeoTubeSeg 43 Local ( 9.51, 3.09, 50.00) Global ( 72.08, 33.09, 78.63) TGeoTubeSeg 44 Local ( 8.09, 5.88, 50.00) Global ( 71.08, 35.88, 79.63) @@ -57,12 +57,12 @@ TGeoTubeSeg 53 Local ( -9.51, -3.09, 50.00) Global ( 58.63, 26.91 TGeoTubeSeg 54 Local ( -8.09, -5.88, 50.00) Global ( 59.63, 24.12, 91.08) TGeoTubeSeg 55 Local ( -5.88, -8.09, 50.00) Global ( 61.20, 21.91, 89.51) TGeoTubeSeg 56 Local ( -3.09, -9.51, 50.00) Global ( 63.17, 20.49, 87.54) -TGeoTubeSeg 57 Local ( -0.00, -10.00, 50.00) Global ( 65.36, 20.00, 85.36) +TGeoTubeSeg 57 Local ( 0.00, -10.00, 50.00) Global ( 65.36, 20.00, 85.36) TGeoTubeSeg 58 Local ( 3.09, -9.51, 50.00) Global ( 67.54, 20.49, 83.17) TGeoTubeSeg 59 Local ( 5.88, -8.09, 50.00) Global ( 69.51, 21.91, 81.20) TGeoTubeSeg 60 Local ( 8.09, -5.88, 50.00) Global ( 71.08, 24.12, 79.63) TGeoTubeSeg 61 Local ( 9.51, -3.09, 50.00) Global ( 72.08, 26.91, 78.63) -TGeoTubeSeg 62 Local ( 10.00, -0.00, 50.00) Global ( 72.43, 30.00, 78.28) +TGeoTubeSeg 62 Local ( 10.00, 0.00, 50.00) Global ( 72.43, 30.00, 78.28) TGeoTubeSeg 63 Local ( 30.00, 0.00, 50.00) Global ( 86.57, 30.00, 64.14) TGeoTubeSeg 64 Local ( 28.53, 9.27, 50.00) Global ( 85.53, 39.27, 65.18) TGeoTubeSeg 65 Local ( 24.27, 17.63, 50.00) Global ( 82.52, 47.63, 68.19) @@ -78,12 +78,12 @@ TGeoTubeSeg 74 Local ( -28.53, -9.27, 50.00) Global ( 45.18, 20.73 TGeoTubeSeg 75 Local ( -24.27, -17.63, 50.00) Global ( 48.19, 12.37, 102.52) TGeoTubeSeg 76 Local ( -17.63, -24.27, 50.00) Global ( 52.89, 5.73, 97.82) TGeoTubeSeg 77 Local ( -9.27, -28.53, 50.00) Global ( 58.80, 1.47, 91.91) -TGeoTubeSeg 78 Local ( -0.00, -30.00, 50.00) Global ( 65.36, 0.00, 85.36) +TGeoTubeSeg 78 Local ( 0.00, -30.00, 50.00) Global ( 65.36, 0.00, 85.36) TGeoTubeSeg 79 Local ( 9.27, -28.53, 50.00) Global ( 71.91, 1.47, 78.80) TGeoTubeSeg 80 Local ( 17.63, -24.27, 50.00) Global ( 77.82, 5.73, 72.89) TGeoTubeSeg 81 Local ( 24.27, -17.63, 50.00) Global ( 82.52, 12.37, 68.19) TGeoTubeSeg 82 Local ( 28.53, -9.27, 50.00) Global ( 85.53, 20.73, 65.18) -TGeoTubeSeg 83 Local ( 30.00, -0.00, 50.00) Global ( 86.57, 30.00, 64.14) +TGeoTubeSeg 83 Local ( 30.00, 0.00, 50.00) Global ( 86.57, 30.00, 64.14) TGeoTubeSeg Bounding box: dx= 30.00 dy= 30.00 dz= 50.00 Origin: x= 0.00 y= 0.00 z= 0.00 ShapeCheck[1] TGeoTubeSeg 84 Mesh-points: TGeoTubeSeg Tube N(mesh)=84 N(vert)=84 N(seg)=168 N(pols)=82 diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt index e4cd8c1bb01f1855f50102871de661f4ece66575..9eaec544a058b3d0196cbf8f468dc553029a6bf6 100644 --- a/examples/Conditions/CMakeLists.txt +++ b/examples/Conditions/CMakeLists.txt @@ -43,7 +43,7 @@ dd4hep_add_test_reg( Conditions_Telescope_cond_dump_by_pool -compact file:${CMAKE_INSTALL_PREFIX}/examples/AlignDet/compact/Telescope.xml -plugin DD4hep_ConditionsXMLRepositoryParser file:${CMAKE_INSTALL_PREFIX}/examples/Conditions/data/repository.xml -plugin DD4hep_ConditionsDump - REGEX_PASS "Data\\(Translation-Rotation\\(Phi,Theta,Psi\\)-Pivot\\): \\[\\( 0 , 0 , 1 \\), \\( 3.14159265359 , 0 , 0 \\), \\( 0 , 0 , 0 \\)\\]" + REGEX_PASS "Data\\(Translation-Rotation\\(Phi,Theta,Psi\\)-Pivot\\): \\[\\( 0 , 0 , 1 \\) \\[cm\\], \\( 3.14159265359 , 0 , 0 \\) \\[rad\\], \\( 0 , 0 , 0 \\) \\[cm\\]\\]" REGEX_FAIL " ERROR ;EXCEPTION;Exception" ) #