diff --git a/.travis.yml b/.travis.yml index 2b3184ae8ac..7a6ca36552c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ services: # matrix build env: + - DOCKER_IMAGE=grzanka/cmssw_810:pre8 CMSSW_VER=CMSSW_8_1_0_pre8 - DOCKER_IMAGE=grzanka/cmssw_810:pre5 CMSSW_VER=CMSSW_8_1_0_pre5 - - DOCKER_IMAGE=grzanka/cmssw_810:pre4 CMSSW_VER=CMSSW_8_1_0_pre4 # here we can define the sub-builds which can fail (and won't mark whole build as failed) -#matrix: -# allow_failures: -# - env: DOCKER_IMAGE=grzanka/cmssw_810:pre5 CMSSW_VER=CMSSW_8_1_0_pre5 +matrix: + allow_failures: + - env: DOCKER_IMAGE=grzanka/cmssw_810:pre5 CMSSW_VER=CMSSW_8_1_0_pre5 language: bash diff --git a/README.md b/README.md index 7b68ef108a1..b9a3f9c3769 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ migrated to newer version of CMSSW framework. ``` ssh -X $USER@lxplus source /afs/cern.ch/cms/cmsset_default.sh -cmsrel CMSSW_8_1_0_pre5 -git clone https://github.com/CTPPS/ctpps-offline.git CMSSW_8_1_0_pre5/src -cd CMSSW_8_1_0_pre5/src +cmsrel CMSSW_8_1_0_pre8 +git clone https://github.com/CTPPS/ctpps-offline.git CMSSW_8_1_0_pre8/src +cd CMSSW_8_1_0_pre8/src cmsenv scram build -j 15 ``` diff --git a/TotemProtonTransport/TotemRPProtonTransportParametrization/interface/RPXMLConfig.h b/TotemProtonTransport/TotemRPProtonTransportParametrization/interface/RPXMLConfig.h index 04aa18fa08d..9c9ecc8a0ef 100644 --- a/TotemProtonTransport/TotemRPProtonTransportParametrization/interface/RPXMLConfig.h +++ b/TotemProtonTransport/TotemRPProtonTransportParametrization/interface/RPXMLConfig.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -105,13 +104,15 @@ class RPXMLConfig // default filename std::string fileName; // parser - DOMBuilder * parser; + DOMLSParser * parser; // document - DOMDocument * doc; + DOMDocument * doc; // main node - DOMNode * mn; + DOMNode * mn; // writer - DOMWriter * writer; + DOMLSSerializer * serializer; +//output + DOMLSOutput* outputDesc; // Constants XMLCh * id_string; diff --git a/TotemProtonTransport/TotemRPProtonTransportParametrization/src/RPXMLConfig.cc b/TotemProtonTransport/TotemRPProtonTransportParametrization/src/RPXMLConfig.cc index 7fd79bedb2c..54af8206fdf 100644 --- a/TotemProtonTransport/TotemRPProtonTransportParametrization/src/RPXMLConfig.cc +++ b/TotemProtonTransport/TotemRPProtonTransportParametrization/src/RPXMLConfig.cc @@ -29,11 +29,14 @@ RPXMLConfig::RPXMLConfig () DOMImplementationRegistry::getDOMImplementation (tempStr); this->parser = ((DOMImplementationLS *) impl)-> - createDOMBuilder (DOMImplementationLS::MODE_SYNCHRONOUS, 0); - this->writer = ((DOMImplementationLS *) impl)->createDOMWriter (); + createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0); + + this->serializer = ((DOMImplementationLS *) impl)->createLSSerializer (); + DOMConfiguration* dc = this->serializer->getDomConfig(); + dc->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true); + + this->outputDesc = ((DOMImplementationLS*)impl)->createLSOutput(); - if (this->writer->canSetFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true)) - this->writer->setFeature (XMLUni::fgDOMWRTFormatPrettyPrint, true); this->doc = 0; @@ -68,7 +71,8 @@ void RPXMLConfig::save (const std::string filename) { XMLFormatTarget *myForm = new StdOutFormatTarget (); - writer->writeNode (myForm, *doc); + outputDesc->setByteStream(myForm); + serializer->write(doc, outputDesc); } void