From a7a4be396466e5242a688e433b18710e47441df2 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Wed, 28 Jan 2015 12:26:01 +0100 Subject: [PATCH 1/2] Update GT and expected result. --- .../Geometry/test/dddvsdb/runDDDvsDBGeometryValidation.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/Geometry/test/dddvsdb/runDDDvsDBGeometryValidation.sh b/Validation/Geometry/test/dddvsdb/runDDDvsDBGeometryValidation.sh index 47595ac980c23..c4ea24079277b 100755 --- a/Validation/Geometry/test/dddvsdb/runDDDvsDBGeometryValidation.sh +++ b/Validation/Geometry/test/dddvsdb/runDDDvsDBGeometryValidation.sh @@ -4,7 +4,7 @@ cmsenv echo " START Geometry Validation" set loctag = '' if ($#argv == 0) then - set gtag="POSTLS172_V6::All" + set gtag="MCRUN2_74_V1::All" set geometry="GeometryExtended2015" else if($#argv == 1) then set gtag=`echo ${1}` @@ -413,7 +413,7 @@ echo "Start Simulation geometry validation" | tee -a GeometryValidation.log echo "Here I am " > readXML.expected echo "Top Most LogicalPart =cms:OCMS " >> readXML.expected echo " mat=materials:Air" >> readXML.expected -echo " solid=cms:OCMS Polycone_rrz: 0 6.28319 -450000 0 1000 -27000 0 1000 -27000 0 13000 27000 0 13000 27000 0 1000 450000 0 1000 " >> readXML.expected +echo " solid=cms:OCMS Polycone_rrz: 0 6.28319 -450000 0 1000 -27000 0 1000 -27000 0 17500 27000 0 17500 27000 0 1000 450000 0 1000 " >> readXML.expected echo "After the GeoHistory in the output file dumpGeoHistoryOnRead you will see x, y, z, r11, r12, r13, r21, r22, r23, r31, r32, r33" >> readXML.expected echo "finished" >> readXML.expected From aec00e69bfd3539a139c92f11b3e1f0262f30f99 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 29 Jan 2015 11:08:23 +0100 Subject: [PATCH 2/2] Cleanup unneeded classValidation/Geometry/BuildFile.xml --- .../Geometry/interface/MonitorElementMgr.h | 34 ------- Validation/Geometry/src/MonitorElementMgr.cc | 99 ------------------- 2 files changed, 133 deletions(-) delete mode 100644 Validation/Geometry/interface/MonitorElementMgr.h delete mode 100644 Validation/Geometry/src/MonitorElementMgr.cc diff --git a/Validation/Geometry/interface/MonitorElementMgr.h b/Validation/Geometry/interface/MonitorElementMgr.h deleted file mode 100644 index cdecd43b3b84e..0000000000000 --- a/Validation/Geometry/interface/MonitorElementMgr.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MonitorElementMgr_h -#define MonitorElementMgr_h - -#include "DQMServices/Core/interface/MonitorElement.h" -#include "TFile.h" -#include -#include - -typedef std::map< int, MonitorElement* > mime; - -class MonitorElementMgr -{ - public: - MonitorElementMgr(); - ~MonitorElementMgr(); - void save( const std::string& name ); - void openSecondFile( const std::string& name ); - - void printComparisonResult( int ime ); - - bool addME( MonitorElement* ime ); - - MonitorElement* getME( int ime ); - - MonitorElement* getMEFromSecondFile( const char* hnam ); - - private: - mime theMonitorElements; - - TFile * theFileRef; - -}; - -#endif diff --git a/Validation/Geometry/src/MonitorElementMgr.cc b/Validation/Geometry/src/MonitorElementMgr.cc deleted file mode 100644 index 1a5998cb38faa..0000000000000 --- a/Validation/Geometry/src/MonitorElementMgr.cc +++ /dev/null @@ -1,99 +0,0 @@ -#include "Validation/Geometry/interface/MonitorElementMgr.h" -#include "CLHEP/Units/GlobalSystemOfUnits.h" -#ifdef StatTesting -#include "Validation/SimG4GeometryValidation/interface/StatisticsComparator.h" -#include "StatisticsTesting/Chi2ComparisonAlgorithm.h" -#endif - -#ifdef PI121 -#include "StatisticsTesting/ComparisonResult.h" -#endif -#include -#include "DQMServices/Core/interface/MonitorElement.h" -#include - -//---------------------------------------------------------------------- -MonitorElementMgr::MonitorElementMgr() -{ - -} - -//---------------------------------------------------------------------- -MonitorElementMgr::~MonitorElementMgr() -{ - //~MonitorElement is protected => delete doesnt work... - /* - mime::const_iterator iter; - for( iter = theMonitorElements.begin(); iter != theMonitorElements.end(); iter++ ){ - delete (*iter).second; - } - */ -} - -//---------------------------------------------------------------------- -void MonitorElementMgr::save( const std::string& name ) -{ - - std::cout << "=== save user histos ===" << std::endl; - TFile fout(name.c_str(),"recreate"); - // write out the histos -mime::const_iterator iter; - std::cout << "Should save " << theMonitorElements.size() << " MEs" << std::endl; - /* - for( iter = theMonitorElements.begin(); iter != theMonitorElements.end(); iter++ ){ - delete (*iter).second; - } - */ -} - -void MonitorElementMgr::openSecondFile( const std::string& name ) -{ - - theFileRef = new TFile(name.c_str()); - - /* std::vector objectNames = theStoreIn->listObjectNames(); - std::vector objectTypes = theStoreIn->listObjectTypes(); - unsigned int siz = objectNames.size(); - for( unsigned int ii = 0; ii < siz; ii++ ) { - // std::cout << " HISTOS IN FILE " << std::endl; - - // std::cout << " HISTO: " << objectNames[ii] << " " << objectTypes[ii] << std::endl; - }*/ -} - -void MonitorElementMgr::printComparisonResult( int ih ) -{ - //still to be implemented for MonitorElements -} - -bool MonitorElementMgr::addME( MonitorElement* sih ) -{ - const char* str = const_cast((sih->getName()).c_str()); - int ih = atoi(str); - theMonitorElements[ih] = sih; - std::cout << " addME " << sih->getName() << " = " << ih << std::endl; - - return true; -} - -MonitorElement* MonitorElementMgr::getME( int ime ) -{ - MonitorElement* me = 0; - mime::const_iterator ite = theMonitorElements.find( ime ); - if( ite != theMonitorElements.end() ) { - me = (*ite).second; - } else { - std::cerr << "!!!! FATAL ERROR MonitorElement does not exist " << ime << std::endl; - std::exception(); - } - return me; -} - -MonitorElement* MonitorElementMgr::getMEFromSecondFile( const char* hnam ) -{ - std::cout << "still to be added for ME" << std::endl; - MonitorElement* me = 0; - std::cerr << "!!!! FATAL ERROR MonitorElement does not exist " << std::endl; - std::exception(); - return me; -}