From 09326bc6640cb268af19df048a492313b821171a Mon Sep 17 00:00:00 2001 From: matta <matta@npt> Date: Mon, 10 Dec 2012 16:19:53 +0000 Subject: [PATCH] * Adding a missing Constant.h file to the mtn revision system --- NPLib/Physics/Constant.h | 22 ++++ NPLib/Physics/NPEnergyLoss.cxx | 2 +- NPLib/Tigress/TTigEventFragmentDict.cxx | 2 +- NPLib/Tigress/TTigressDataDict.cxx | 2 +- NPLib/Tigress/TTigressPhysicsDict.cxx | 139 ++++++++++++++---------- NPLib/Tigress/TTigressPhysicsDict.h | 11 +- NPLib/VDetector/DetectorManager.cxx | 19 ++++ 7 files changed, 135 insertions(+), 62 deletions(-) create mode 100755 NPLib/Physics/Constant.h diff --git a/NPLib/Physics/Constant.h b/NPLib/Physics/Constant.h new file mode 100755 index 000000000..fff081b02 --- /dev/null +++ b/NPLib/Physics/Constant.h @@ -0,0 +1,22 @@ +// Quelques constantes utiles .... +// +// en MeV +#define hbarc 197. + +// sans unite +#define alpha 137.0359895 + +// en MeV.c-2 +#define uma 931.49432 + +// en mol-1 +#define Na 6.0221367e23 + +// en m.s-1 +#define C 2.99792458e8 + +// en MeV.T9-1 +#define kB 8.61735e-2 + +// en C +#define echarge 1.602177e-19 diff --git a/NPLib/Physics/NPEnergyLoss.cxx b/NPLib/Physics/NPEnergyLoss.cxx index 778a712b7..b16f0d223 100644 --- a/NPLib/Physics/NPEnergyLoss.cxx +++ b/NPLib/Physics/NPEnergyLoss.cxx @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (C) 2009 this file is part of the NPTool Project * + * Copyright (C) 2009 this file is part of the NPTool Project * * * * For the licensing terms see $NPTOOL/Licence/NPTool_Licence * * For the list of contributors see $NPTOOL/Licence/Contributors * diff --git a/NPLib/Tigress/TTigEventFragmentDict.cxx b/NPLib/Tigress/TTigEventFragmentDict.cxx index dcd14ecb6..f9b45fe2c 100644 --- a/NPLib/Tigress/TTigEventFragmentDict.cxx +++ b/NPLib/Tigress/TTigEventFragmentDict.cxx @@ -1,5 +1,5 @@ // -// File generated by rootcint at Wed Dec 5 12:47:14 2012 +// File generated by rootcint at Mon Dec 10 15:39:44 2012 // Do NOT change. Changes will be lost next time file is generated // diff --git a/NPLib/Tigress/TTigressDataDict.cxx b/NPLib/Tigress/TTigressDataDict.cxx index bd03c9198..2457ce04c 100644 --- a/NPLib/Tigress/TTigressDataDict.cxx +++ b/NPLib/Tigress/TTigressDataDict.cxx @@ -1,5 +1,5 @@ // -// File generated by rootcint at Wed Dec 5 10:21:18 2012 +// File generated by rootcint at Mon Dec 10 15:39:42 2012 // Do NOT change. Changes will be lost next time file is generated // diff --git a/NPLib/Tigress/TTigressPhysicsDict.cxx b/NPLib/Tigress/TTigressPhysicsDict.cxx index cc03d9a88..1259b5bb3 100644 --- a/NPLib/Tigress/TTigressPhysicsDict.cxx +++ b/NPLib/Tigress/TTigressPhysicsDict.cxx @@ -1,5 +1,5 @@ // -// File generated by rootcint at Tue Dec 4 10:29:54 2012 +// File generated by rootcint at Mon Dec 10 15:39:46 2012 // Do NOT change. Changes will be lost next time file is generated // @@ -565,7 +565,7 @@ extern "C" int G__cpp_dllrevTTigressPhysicsDict() { return(30051515); } *********************************************************/ /* TTigressPhysics */ -static int G__TTigressPhysicsDict_483_0_1(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_1(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { TTigressPhysics* p = NULL; char* gvp = (char*) G__getgvp(); @@ -589,21 +589,21 @@ static int G__TTigressPhysicsDict_483_0_1(G__value* result7, G__CONST char* func return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_2(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_2(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { ((TTigressPhysics*) G__getstructoffset())->Clear(); G__setnull(result7); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_12(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_12(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { ((TTigressPhysics*) G__getstructoffset())->PreTreat(); G__setnull(result7); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_14(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_14(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { { TVector3* pobj; @@ -616,64 +616,64 @@ static int G__TTigressPhysicsDict_483_0_14(G__value* result7, G__CONST char* fun return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_15(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_15(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 85, (long) TTigressPhysics::Class()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_16(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_16(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 67, (long) TTigressPhysics::Class_Name()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_17(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_17(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 115, (long) TTigressPhysics::Class_Version()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_18(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_18(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { TTigressPhysics::Dictionary(); G__setnull(result7); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_22(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_22(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { ((TTigressPhysics*) G__getstructoffset())->StreamerNVirtual(*(TBuffer*) libp->para[0].ref); G__setnull(result7); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_23(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_23(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 67, (long) TTigressPhysics::DeclFileName()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_24(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_24(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 105, (long) TTigressPhysics::ImplFileLine()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_25(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_25(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 67, (long) TTigressPhysics::ImplFileName()); return(1 || funcname || hash || result7 || libp) ; } -static int G__TTigressPhysicsDict_483_0_26(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_26(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { G__letint(result7, 105, (long) TTigressPhysics::DeclFileLine()); return(1 || funcname || hash || result7 || libp) ; } // automatic copy constructor -static int G__TTigressPhysicsDict_483_0_27(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_27(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { TTigressPhysics* p; @@ -687,7 +687,7 @@ static int G__TTigressPhysicsDict_483_0_27(G__value* result7, G__CONST char* fun // automatic destructor typedef TTigressPhysics G__TTTigressPhysics; -static int G__TTigressPhysicsDict_483_0_28(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_28(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { char* gvp = (char*) G__getgvp(); long soff = G__getstructoffset(); @@ -724,7 +724,7 @@ static int G__TTigressPhysicsDict_483_0_28(G__value* result7, G__CONST char* fun } // automatic assignment operator -static int G__TTigressPhysicsDict_483_0_29(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) +static int G__TTigressPhysicsDict_523_0_29(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash) { TTigressPhysics* dest = (TTigressPhysics*) G__getstructoffset(); *dest = *(TTigressPhysics*) libp->para[0].ref; @@ -812,17 +812,35 @@ extern "C" void G__cpp_setup_typetableTTigressPhysicsDict() { G__setnewtype(-1,NULL,0); G__search_typename2("reverse_iterator<iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR)); G__setnewtype(-1,NULL,0); + G__search_typename2("TVectorT<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVectorTlEfloatgR),0,-1); + G__setnewtype(-1,NULL,0); + G__search_typename2("TVectorT<Double_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVectorTlEdoublegR),0,-1); + G__setnewtype(-1,NULL,0); + G__search_typename2("vector<int>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR),0,-1); + G__setnewtype(-1,NULL,0); + G__search_typename2("reverse_iterator<const_iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR)); + G__setnewtype(-1,NULL,0); + G__search_typename2("reverse_iterator<iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR)); + G__setnewtype(-1,NULL,0); + G__search_typename2("vector<TH1F>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR),0,-1); + G__setnewtype(-1,NULL,0); + G__search_typename2("reverse_iterator<const_iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR)); + G__setnewtype(-1,NULL,0); + G__search_typename2("reverse_iterator<iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR)); + G__setnewtype(-1,NULL,0); G__search_typename2("vector<UShort_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEunsignedsPshortcOallocatorlEunsignedsPshortgRsPgR),0,-1); G__setnewtype(-1,NULL,0); G__search_typename2("vector<Double_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEdoublecOallocatorlEdoublegRsPgR),0,-1); G__setnewtype(-1,NULL,0); - G__search_typename2("TMatrixTBase<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR),0,-1); + G__search_typename2("map<int,vector<int> >",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR),0,-1); G__setnewtype(-1,NULL,0); - G__search_typename2("TMatrixTBase<Double_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR),0,-1); + G__search_typename2("map<int,vector<int,allocator<int> > >",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR),0,-1); G__setnewtype(-1,NULL,0); - G__search_typename2("TVectorT<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVectorTlEfloatgR),0,-1); + G__search_typename2("map<int,vector<int,allocator<int> >,less<int> >",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR),0,-1); G__setnewtype(-1,NULL,0); - G__search_typename2("TVectorT<Double_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVectorTlEdoublegR),0,-1); + G__search_typename2("TMatrixTBase<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR),0,-1); + G__setnewtype(-1,NULL,0); + G__search_typename2("TMatrixTBase<Double_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR),0,-1); G__setnewtype(-1,NULL,0); G__search_typename2("TMatrixT<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TMatrixTlEfloatgR),0,-1); G__setnewtype(-1,NULL,0); @@ -858,12 +876,6 @@ extern "C" void G__cpp_setup_typetableTTigressPhysicsDict() { G__setnewtype(-1,NULL,0); G__search_typename2("TElementPosActionT<Float_t>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TElementPosActionTlEfloatgR),0,-1); G__setnewtype(-1,NULL,0); - G__search_typename2("vector<int>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR),0,-1); - G__setnewtype(-1,NULL,0); - G__search_typename2("reverse_iterator<const_iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR)); - G__setnewtype(-1,NULL,0); - G__search_typename2("reverse_iterator<iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR)); - G__setnewtype(-1,NULL,0); G__search_typename2("vector<TTigressCrystal>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR),0,-1); G__setnewtype(-1,NULL,0); G__search_typename2("reverse_iterator<const_iterator>",117,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgRcLcLiteratorgR),0,G__get_linked_tagnum(&G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR)); @@ -932,8 +944,8 @@ extern "C" void G__cpp_setup_memvarTTigressPhysicsDict() { static void G__setup_memfuncTTigressPhysics(void) { /* TTigressPhysics */ G__tag_memfunc_setup(G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics)); - G__memfunc_setup("TTigressPhysics",1560,G__TTigressPhysicsDict_483_0_1, 105, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); - G__memfunc_setup("Clear",487,G__TTigressPhysicsDict_483_0_2, 121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); + G__memfunc_setup("TTigressPhysics",1560,G__TTigressPhysicsDict_523_0_1, 105, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); + G__memfunc_setup("Clear",487,G__TTigressPhysicsDict_523_0_2, 121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); G__memfunc_setup("ReadConfiguration",1748,(G__InterfaceMethod) NULL,121, -1, -1, 0, 1, 1, 1, 0, "u 'string' - 0 - -", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("AddParameterToCalibrationManager",3216,(G__InterfaceMethod) NULL,121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("InitializeRootInputRaw",2288,(G__InterfaceMethod) NULL,121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 1); @@ -943,29 +955,29 @@ static void G__setup_memfuncTTigressPhysics(void) { G__memfunc_setup("BuildSimplePhysicalEvent",2457,(G__InterfaceMethod) NULL,121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("ClearEventPhysics",1740,(G__InterfaceMethod) NULL,121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("ClearEventData",1379,(G__InterfaceMethod) NULL,121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 1); - G__memfunc_setup("PreTreat",807,G__TTigressPhysicsDict_483_0_12, 121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); + G__memfunc_setup("PreTreat",807,G__TTigressPhysicsDict_523_0_12, 121, -1, -1, 0, 0, 1, 1, 0, "", (char*)NULL, (void*) NULL, 0); G__memfunc_setup("AddClover",884,(G__InterfaceMethod) NULL, 121, -1, -1, 0, 4, 1, 4, 0, "i - - 0 - - d - - 0 - - " "d - - 0 - - d - - 0 - -", (char*)NULL, (void*) NULL, 0); - G__memfunc_setup("GetPositionOfInteraction",2474,G__TTigressPhysicsDict_483_0_14, 117, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVector3), -1, 0, 1, 1, 1, 0, "i - - 0 - i", (char*)NULL, (void*) NULL, 0); - G__memfunc_setup("Class",502,G__TTigressPhysicsDict_483_0_15, 85, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TClass), -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (TClass* (*)())(&TTigressPhysics::Class) ), 0); - G__memfunc_setup("Class_Name",982,G__TTigressPhysicsDict_483_0_16, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::Class_Name) ), 0); - G__memfunc_setup("Class_Version",1339,G__TTigressPhysicsDict_483_0_17, 115, -1, G__defined_typename("Version_t"), 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (Version_t (*)())(&TTigressPhysics::Class_Version) ), 0); - G__memfunc_setup("Dictionary",1046,G__TTigressPhysicsDict_483_0_18, 121, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (void (*)())(&TTigressPhysics::Dictionary) ), 0); + G__memfunc_setup("GetPositionOfInteraction",2474,G__TTigressPhysicsDict_523_0_14, 117, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TVector3), -1, 0, 1, 1, 1, 0, "i - - 0 - i", (char*)NULL, (void*) NULL, 0); + G__memfunc_setup("Class",502,G__TTigressPhysicsDict_523_0_15, 85, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TClass), -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (TClass* (*)())(&TTigressPhysics::Class) ), 0); + G__memfunc_setup("Class_Name",982,G__TTigressPhysicsDict_523_0_16, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::Class_Name) ), 0); + G__memfunc_setup("Class_Version",1339,G__TTigressPhysicsDict_523_0_17, 115, -1, G__defined_typename("Version_t"), 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (Version_t (*)())(&TTigressPhysics::Class_Version) ), 0); + G__memfunc_setup("Dictionary",1046,G__TTigressPhysicsDict_523_0_18, 121, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (void (*)())(&TTigressPhysics::Dictionary) ), 0); G__memfunc_setup("IsA",253,(G__InterfaceMethod) NULL,85, G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TClass), -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("ShowMembers",1132,(G__InterfaceMethod) NULL,121, -1, -1, 0, 1, 1, 1, 0, "u 'TMemberInspector' - 1 - insp", (char*)NULL, (void*) NULL, 1); G__memfunc_setup("Streamer",835,(G__InterfaceMethod) NULL,121, -1, -1, 0, 1, 1, 1, 0, "u 'TBuffer' - 1 - b", (char*)NULL, (void*) NULL, 1); - G__memfunc_setup("StreamerNVirtual",1656,G__TTigressPhysicsDict_483_0_22, 121, -1, -1, 0, 1, 1, 1, 0, "u 'TBuffer' - 1 - b", (char*)NULL, (void*) NULL, 0); - G__memfunc_setup("DeclFileName",1145,G__TTigressPhysicsDict_483_0_23, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::DeclFileName) ), 0); - G__memfunc_setup("ImplFileLine",1178,G__TTigressPhysicsDict_483_0_24, 105, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (int (*)())(&TTigressPhysics::ImplFileLine) ), 0); - G__memfunc_setup("ImplFileName",1171,G__TTigressPhysicsDict_483_0_25, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::ImplFileName) ), 0); - G__memfunc_setup("DeclFileLine",1152,G__TTigressPhysicsDict_483_0_26, 105, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (int (*)())(&TTigressPhysics::DeclFileLine) ), 0); + G__memfunc_setup("StreamerNVirtual",1656,G__TTigressPhysicsDict_523_0_22, 121, -1, -1, 0, 1, 1, 1, 0, "u 'TBuffer' - 1 - b", (char*)NULL, (void*) NULL, 0); + G__memfunc_setup("DeclFileName",1145,G__TTigressPhysicsDict_523_0_23, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::DeclFileName) ), 0); + G__memfunc_setup("ImplFileLine",1178,G__TTigressPhysicsDict_523_0_24, 105, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (int (*)())(&TTigressPhysics::ImplFileLine) ), 0); + G__memfunc_setup("ImplFileName",1171,G__TTigressPhysicsDict_523_0_25, 67, -1, -1, 0, 0, 3, 1, 1, "", (char*)NULL, (void*) G__func2void( (const char* (*)())(&TTigressPhysics::ImplFileName) ), 0); + G__memfunc_setup("DeclFileLine",1152,G__TTigressPhysicsDict_523_0_26, 105, -1, -1, 0, 0, 3, 1, 0, "", (char*)NULL, (void*) G__func2void( (int (*)())(&TTigressPhysics::DeclFileLine) ), 0); // automatic copy constructor - G__memfunc_setup("TTigressPhysics", 1560, G__TTigressPhysicsDict_483_0_27, (int) ('i'), G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 0, 1, 1, 1, 0, "u 'TTigressPhysics' - 11 - -", (char*) NULL, (void*) NULL, 0); + G__memfunc_setup("TTigressPhysics", 1560, G__TTigressPhysicsDict_523_0_27, (int) ('i'), G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 0, 1, 1, 1, 0, "u 'TTigressPhysics' - 11 - -", (char*) NULL, (void*) NULL, 0); // automatic destructor - G__memfunc_setup("~TTigressPhysics", 1686, G__TTigressPhysicsDict_483_0_28, (int) ('y'), -1, -1, 0, 0, 1, 1, 0, "", (char*) NULL, (void*) NULL, 1); + G__memfunc_setup("~TTigressPhysics", 1686, G__TTigressPhysicsDict_523_0_28, (int) ('y'), -1, -1, 0, 0, 1, 1, 0, "", (char*) NULL, (void*) NULL, 1); // automatic assignment operator - G__memfunc_setup("operator=", 937, G__TTigressPhysicsDict_483_0_29, (int) ('u'), G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 1, 1, 1, 1, 0, "u 'TTigressPhysics' - 11 - -", (char*) NULL, (void*) NULL, 0); + G__memfunc_setup("operator=", 937, G__TTigressPhysicsDict_523_0_29, (int) ('u'), G__get_linked_tagnum(&G__TTigressPhysicsDictLN_TTigressPhysics), -1, 1, 1, 1, 1, 0, "u 'TTigressPhysics' - 11 - -", (char*) NULL, (void*) NULL, 0); G__tag_memfunc_reset(); } @@ -990,6 +1002,9 @@ static void G__cpp_setup_global1() { } static void G__cpp_setup_global2() { +} + +static void G__cpp_setup_global3() { G__resetglobalenv(); } @@ -997,6 +1012,7 @@ extern "C" void G__cpp_setup_globalTTigressPhysicsDict() { G__cpp_setup_global0(); G__cpp_setup_global1(); G__cpp_setup_global2(); + G__cpp_setup_global3(); } /********************************************************* @@ -1065,6 +1081,9 @@ static void G__cpp_setup_func19() { } static void G__cpp_setup_func20() { +} + +static void G__cpp_setup_func21() { G__resetifuncposition(); } @@ -1091,6 +1110,7 @@ extern "C" void G__cpp_setup_funcTTigressPhysicsDict() { G__cpp_setup_func18(); G__cpp_setup_func19(); G__cpp_setup_func20(); + G__cpp_setup_func21(); } /********************************************************* @@ -1109,11 +1129,16 @@ G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEROOTcLcLTSchemaHelpercOalloca G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR = { "reverse_iterator<vector<ROOT::TSchemaHelper,allocator<ROOT::TSchemaHelper> >::iterator>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR = { "vector<TVirtualArray*,allocator<TVirtualArray*> >" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR = { "reverse_iterator<vector<TVirtualArray*,allocator<TVirtualArray*> >::iterator>" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEfloatgR = { "TVectorT<float>" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEdoublegR = { "TVectorT<double>" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR = { "vector<int,allocator<int> >" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR = { "reverse_iterator<vector<int,allocator<int> >::iterator>" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR = { "vector<TH1F,allocator<TH1F> >" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR = { "reverse_iterator<vector<TH1F,allocator<TH1F> >::iterator>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TTigressData = { "TTigressData" , 99 , -1 }; +G__linked_taginfo G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR = { "map<int,vector<int,allocator<int> >,less<int>,allocator<pair<const int,vector<int,allocator<int> > > > >" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR = { "TMatrixTBase<float>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR = { "TMatrixTBase<double>" , 99 , -1 }; -G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEfloatgR = { "TVectorT<float>" , 99 , -1 }; -G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEdoublegR = { "TVectorT<double>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TElementActionTlEfloatgR = { "TElementActionT<float>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TElementPosActionTlEfloatgR = { "TElementPosActionT<float>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTlEfloatgR = { "TMatrixT<float>" , 99 , -1 }; @@ -1132,8 +1157,6 @@ G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSublEfloatgR = { "TMatrixTSub G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSparseRowlEfloatgR = { "TMatrixTSparseRow<float>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSparseDiaglEfloatgR = { "TMatrixTSparseDiag<float>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_TVector3 = { "TVector3" , 99 , -1 }; -G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR = { "vector<int,allocator<int> >" , 99 , -1 }; -G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR = { "reverse_iterator<vector<int,allocator<int> >::iterator>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR = { "vector<TTigressCrystal,allocator<TTigressCrystal> >" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgRcLcLiteratorgR = { "reverse_iterator<vector<TTigressCrystal,allocator<TTigressCrystal> >::iterator>" , 99 , -1 }; G__linked_taginfo G__TTigressPhysicsDictLN_maplEstringcOvectorlEdoublecOallocatorlEdoublegRsPgRcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOvectorlEdoublecOallocatorlEdoublegRsPgRsPgRsPgRsPgR = { "map<string,vector<double,allocator<double> >,less<string>,allocator<pair<const string,vector<double,allocator<double> > > > >" , 99 , -1 }; @@ -1159,11 +1182,16 @@ extern "C" void G__cpp_reset_tagtableTTigressPhysicsDict() { G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR.tagnum = -1 ; G__TTigressPhysicsDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR.tagnum = -1 ; G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR.tagnum = -1 ; + G__TTigressPhysicsDictLN_TVectorTlEfloatgR.tagnum = -1 ; + G__TTigressPhysicsDictLN_TVectorTlEdoublegR.tagnum = -1 ; + G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR.tagnum = -1 ; + G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR.tagnum = -1 ; + G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR.tagnum = -1 ; + G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TTigressData.tagnum = -1 ; + G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR.tagnum = -1 ; - G__TTigressPhysicsDictLN_TVectorTlEfloatgR.tagnum = -1 ; - G__TTigressPhysicsDictLN_TVectorTlEdoublegR.tagnum = -1 ; G__TTigressPhysicsDictLN_TElementActionTlEfloatgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TElementPosActionTlEfloatgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TMatrixTlEfloatgR.tagnum = -1 ; @@ -1182,8 +1210,6 @@ extern "C" void G__cpp_reset_tagtableTTigressPhysicsDict() { G__TTigressPhysicsDictLN_TMatrixTSparseRowlEfloatgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TMatrixTSparseDiaglEfloatgR.tagnum = -1 ; G__TTigressPhysicsDictLN_TVector3.tagnum = -1 ; - G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR.tagnum = -1 ; - G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR.tagnum = -1 ; G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR.tagnum = -1 ; G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgRcLcLiteratorgR.tagnum = -1 ; G__TTigressPhysicsDictLN_maplEstringcOvectorlEdoublecOallocatorlEdoublegRsPgRcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOvectorlEdoublecOallocatorlEdoublegRsPgRsPgRsPgRsPgR.tagnum = -1 ; @@ -1212,11 +1238,16 @@ extern "C" void G__cpp_setup_tagtableTTigressPhysicsDict() { G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TVectorTlEfloatgR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TVectorTlEdoublegR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TTigressData); + G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR); - G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TVectorTlEfloatgR); - G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TVectorTlEdoublegR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TElementActionTlEfloatgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TElementPosActionTlEfloatgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TMatrixTlEfloatgR); @@ -1235,8 +1266,6 @@ extern "C" void G__cpp_setup_tagtableTTigressPhysicsDict() { G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TMatrixTSparseRowlEfloatgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TMatrixTSparseDiaglEfloatgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_TVector3); - G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR); - G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgRcLcLiteratorgR); G__get_linked_tagnum_fwd(&G__TTigressPhysicsDictLN_maplEstringcOvectorlEdoublecOallocatorlEdoublegRsPgRcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOvectorlEdoublecOallocatorlEdoublegRsPgRsPgRsPgRsPgR); diff --git a/NPLib/Tigress/TTigressPhysicsDict.h b/NPLib/Tigress/TTigressPhysicsDict.h index c08176173..711405eea 100644 --- a/NPLib/Tigress/TTigressPhysicsDict.h +++ b/NPLib/Tigress/TTigressPhysicsDict.h @@ -51,11 +51,16 @@ extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEROOTcLcLTSchemaHelperc extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEROOTcLcLTSchemaHelpercOallocatorlEROOTcLcLTSchemaHelpergRsPgRcLcLiteratorgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETVirtualArraymUcOallocatorlETVirtualArraymUgRsPgRcLcLiteratorgR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEfloatgR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEdoublegR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETH1FcOallocatorlETH1FgRsPgR; +extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETH1FcOallocatorlETH1FgRsPgRcLcLiteratorgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TTigressData; +extern G__linked_taginfo G__TTigressPhysicsDictLN_maplEintcOvectorlEintcOallocatorlEintgRsPgRcOlesslEintgRcOallocatorlEpairlEconstsPintcOvectorlEintcOallocatorlEintgRsPgRsPgRsPgRsPgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTBaselEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTBaselEdoublegR; -extern G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEfloatgR; -extern G__linked_taginfo G__TTigressPhysicsDictLN_TVectorTlEdoublegR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TElementActionTlEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TElementPosActionTlEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTlEfloatgR; @@ -74,8 +79,6 @@ extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSublEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSparseRowlEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TMatrixTSparseDiaglEfloatgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_TVector3; -extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlEintcOallocatorlEintgRsPgR; -extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlEintcOallocatorlEintgRsPgRcLcLiteratorgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_vectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_reverse_iteratorlEvectorlETTigressCrystalcOallocatorlETTigressCrystalgRsPgRcLcLiteratorgR; extern G__linked_taginfo G__TTigressPhysicsDictLN_maplEstringcOvectorlEdoublecOallocatorlEdoublegRsPgRcOlesslEstringgRcOallocatorlEpairlEconstsPstringcOvectorlEdoublecOallocatorlEdoublegRsPgRsPgRsPgRsPgR; diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index ec5406ac0..71e1a9155 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -9,6 +9,7 @@ #include "TMust2Physics.h" #include "TCATSPhysics.h" #include "TSSSDPhysics.h" +#include "TTrifoilPhysics.h" #include "TPlasticPhysics.h" #include "GaspardTracker.h" #include "HydeTracker.h" @@ -51,6 +52,7 @@ void DetectorManager::ReadConfigurationFile(string Path) bool CATS = false; bool SSSD = false; bool ScintillatorPlastic = false; + bool Trifoil = false; bool GeneralTarget = false; bool GPDTracker = false; bool HYDTracker = false; @@ -254,6 +256,23 @@ void DetectorManager::ReadConfigurationFile(string Path) AddDetector("Plastic", myDetector); } + //////////////////////////////////////////// + ///////////// Search for Trifoil /////////// + //////////////////////////////////////////// + else if (LineBuffer.compare(0, 7, "Trifoil") == 0 && Trifoil == false) { + Trifoil = true; + cout << "//////// Trifoil ////////" << endl << endl; + + // Instantiate the new array as a VDetector Object + VDetector* myDetector = new TTrifoilPhysics(); + // Read Position of Telescope + ConfigFile.close(); + myDetector->ReadConfiguration(Path); + ConfigFile.open(Path.c_str()); + + // Add array to the VDetector Vector + AddDetector("Trifoil", myDetector); + } //////////////////////////////////////////// //////////// Search for Target ///////////// -- GitLab