Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions roottest/root/meta/ROOT-7181/.rootrc

This file was deleted.

52 changes: 44 additions & 8 deletions roottest/root/meta/ROOT-7181/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,44 @@
#-------------------------------------------------------------------------------
#
# Placeholder file to translate the tests to the new CTest system. Meanwhile we
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
#
#-------------------------------------------------------------------------------

ROOTTEST_ADD_OLDTEST()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(btag
inc/BTagVertex_v1.h
SELECTION inc/btag_selection.xml
FIXTURES_SETUP root-meta-7181-btag-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(jet
inc/Jet_v1.h
SELECTION inc/jet_selection.xml
FIXTURES_SETUP root-meta-7181-jet-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(sjet
inc/SJet_v1.h
SELECTION inc/sjet_selection.xml
FIXTURES_SETUP root-meta-7181-sjet-fixture)

macro(ROOT_7181_TEST name use_rmap)
if(${use_rmap} STREQUAL "true")
set(testname rmap-${name})
else()
set(testname ${name})
endif()

ROOTTEST_ADD_TEST(${testname}
MACRO runscript.C
MACROARG "\"${name}\",${use_rmap}"
ROOTEXE_OPTS -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}\")"
-e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}/inc\")"
OUTREF ${testname}.ref
FIXTURES_REQUIRED root-meta-7181-btag-fixture
root-meta-7181-jet-fixture
root-meta-7181-sjet-fixture)
endmacro(ROOT_7181_TEST)

ROOT_7181_TEST(case1 false)
ROOT_7181_TEST(case2 false)
ROOT_7181_TEST(case3 false)
ROOT_7181_TEST(case4 false)

ROOT_7181_TEST(case1 true)
ROOT_7181_TEST(case2 true)
ROOT_7181_TEST(case3 true)
ROOT_7181_TEST(case4 true)
57 changes: 0 additions & 57 deletions roottest/root/meta/ROOT-7181/Makefile

This file was deleted.

1 change: 1 addition & 0 deletions roottest/root/meta/ROOT-7181/case1.ref
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

Processing runscript.C("scripts/case1.script",false)...
Classinfo for DataVector<xAOD::Jet_v1> is valid
1 change: 1 addition & 0 deletions roottest/root/meta/ROOT-7181/case2.ref
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

Processing runscript.C("scripts/case2.script",false)...
Classinfo for SDataVector<xAOD::SJet_v1> is valid
1 change: 1 addition & 0 deletions roottest/root/meta/ROOT-7181/case3.ref
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

Processing runscript.C("scripts/case3.script",false)...
TClass for DataVector<xAOD::Jet_v1> is loaded
1 change: 1 addition & 0 deletions roottest/root/meta/ROOT-7181/case4.ref
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

Processing runscript.C("scripts/case4.script",false)...
Normalized name for DataVector<xAOD::Jet_v1> is : DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase> >
15 changes: 0 additions & 15 deletions roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,4 @@ namespace xAOD {
typedef DataVector<BTagging_v1> BTaggingContainer_v1;
}

#if 0
template <> struct DataVectorBase<xAOD::BTagVertex_v1>
{
typedef DataVector<xAOD::IParticle > Base;
int fBtag;
};

template <> struct DataVectorBase<xAOD::BTagging_v1>
{
typedef DataVector<xAOD::IParticle > Base;
int fBtagging;
};

#endif

#endif
5 changes: 5 additions & 0 deletions roottest/root/meta/ROOT-7181/inc/jet_selection.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<class name="ElementLinkVector<xAOD::JetContainer_v1>" />
<class name="std::vector<ElementLinkVector<xAOD::JetContainer_v1> >" />

<class name="DataVector<xAOD::Jet_v1>" />
<class name="ElementLink<DataVector<xAOD::Jet_v1>>" />
<class name="std::vector<ElementLink<DataVector<xAOD::Jet_v1>>>" />
<class name="SG::AuxTypeVectorFactory<std::vector<ElementLink<DataVector<xAOD::Jet_v1>>>>"/>

<!-- <class name="std::pair<std::string,std::vector<const xAOD::IParticle*> >" /> -->
<!--
<class name="std::pair<std::string,std::vector<float> >" />
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/meta/ROOT-7181/rmap-case1.ref
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

Processing scripts/loadrootmap.C...
Processing runscript.C("scripts/case1.script",true)...
Classinfo for DataVector<xAOD::Jet_v1> is valid
2 changes: 1 addition & 1 deletion roottest/root/meta/ROOT-7181/rmap-case2.ref
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

Processing scripts/loadrootmap.C...
Processing runscript.C("scripts/case2.script",true)...
Classinfo for SDataVector<xAOD::SJet_v1> is valid
2 changes: 1 addition & 1 deletion roottest/root/meta/ROOT-7181/rmap-case3.ref
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

Processing scripts/loadrootmap.C...
Processing runscript.C("scripts/case3.script",true)...
TClass for DataVector<xAOD::Jet_v1> is loaded
2 changes: 1 addition & 1 deletion roottest/root/meta/ROOT-7181/rmap-case4.ref
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

Processing scripts/loadrootmap.C...
Processing runscript.C("scripts/case4.script",true)...
Normalized name for DataVector<xAOD::Jet_v1> is : DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase> >
46 changes: 46 additions & 0 deletions roottest/root/meta/ROOT-7181/runscript.C
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>


#include "DataVector.h"

void runscript(const std::string &name, bool with_rootmap = false)
{
if (with_rootmap) {
int old = gInterpreter->SetClassAutoloading(kFALSE);
gInterpreter->LoadLibraryMap("libbtag.rootmap");
gInterpreter->LoadLibraryMap("libjet.rootmap");
gInterpreter->LoadLibraryMap("libsjet.rootmap");
gInterpreter->SetClassAutoloading(old);
}

if (name == "case1") {
gSystem->Load("libjet_dictrflx");
gSystem->Load("libbtag_dictrflx");
TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<DataVector<xAOD::Jet_v1> > > >");
auto c = TClass::GetClass("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>")->GetClassInfo();
printf("Classinfo for DataVector<xAOD::Jet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
} else if (name == "case2") {
gSystem->Load("libsjet_dictrflx");
gSystem->Load("libbtag_dictrflx");
TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<SDataVector<xAOD::SJet_v1> > > >");
auto c = TClass::GetClass("SDataVector<xAOD::SJet_v1>")->GetClassInfo();
printf("Classinfo for SDataVector<xAOD::SJet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
} else if (name == "case3") {
gSystem->Load("libjet_dictrflx");
gSystem->Load("libbtag_dictrflx");
auto c = TClass::GetClass("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>>");
printf("TClass for DataVector<xAOD::Jet_v1> is %s\n",c->IsLoaded() ? "loaded" : "not loaded");
} else if (name == "case4") {
gSystem->Load("libjet_dictrflx");
gSystem->Load("libbtag_dictrflx");
gROOT->ProcessLine("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>> obj;");
std::string name;
TClassEdit::GetNormalizedName(name,"DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>");
// TClass::GetClass("DataVector<xAOD::Jet_v1>");
printf("Normalized name for DataVector<xAOD::Jet_v1> is : %s\n",name.c_str());
}
}

6 changes: 0 additions & 6 deletions roottest/root/meta/ROOT-7181/scripts/case1.script

This file was deleted.

7 changes: 0 additions & 7 deletions roottest/root/meta/ROOT-7181/scripts/case2.script

This file was deleted.

7 changes: 0 additions & 7 deletions roottest/root/meta/ROOT-7181/scripts/case3.script

This file was deleted.

12 changes: 0 additions & 12 deletions roottest/root/meta/ROOT-7181/scripts/case4.script

This file was deleted.

8 changes: 0 additions & 8 deletions roottest/root/meta/ROOT-7181/scripts/loadrootmap.C

This file was deleted.

Loading