Merge DDCMS and DDCMSTests

etc/CompileAllOptionPermutations.sh

@@ -163,7 +163,6 @@ build_all()
                     OPTS="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
 		    `make_opt ${DOLCIO}     -DDD4HEP_USE_LCIO -DLCIO_DIR=${INSTALL_LCIO}` \
 		    `make_opt ${DOXERCESC}  -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
-                    -DCLHEP_INCLUDE_DIR=${INSTALL_G4}/../../include/Geant4/CLHEP -DCLHEP_LIBRARY=${INSTALL_G4}/../libG4clhep.so \
                     -DROOTSYS=${ROOTSYS} -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/DD4hep";
 		    CMD="cd ${dir_name}/$folder ; cmake ${BUILD_TYPE} ${OPTS} ${CHECKOUT};";
                     make_build;
@@ -174,7 +173,6 @@ build_all()
                     OPTS_ex="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
 		    `make_opt ${DOLCIO}     -DDD4HEP_USE_LCIO    -DLCIO_DIR=${INSTALL_LCIO}` \
 		    `make_opt ${DOXERCESC}  -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
-                    -DCLHEP_INCLUDE_DIR=${INSTALL_G4}/../../include/Geant4/CLHEP -DCLHEP_LIBRARY=${INSTALL_G4}/../libG4clhep.so \
                     -DROOTSYS=${ROOTSYS}";
 		    source ${DD4hep_DIR}/bin/thisdd4hep.sh;
    		    CMD="cd ${WORK_DIR}/EX; cmake ${BUILD_TYPE} ${OPTS} -DDD4hep_DIR=${DD4hep_DIR} ${CHECKOUT}/examples;";

examples/DDDB/src/Detector/DeVeloConditionCalls.cpp

@@ -70,7 +70,7 @@ void DeVeloStaticConditionCall::resolve(Condition c, Context& context)    {
           side->parent = vp.access();
           side->de_user |= DeVeloFlags::SIDE;
           vp->sides[sideNo] = side;
-          printout(INFO,"DeVeloStatic","Add Side[%03ld]:    %s",vp->sides.size()-1,path.c_str());
+          printout(DEBUG,"DeVeloStatic","Add Side[%03ld]:    %s",vp->sides.size()-1,path.c_str());
           break;
         case 2:
           module = cond;
@@ -78,7 +78,7 @@ void DeVeloStaticConditionCall::resolve(Condition c, Context& context)    {
           module->de_user |= DeVeloFlags::MODULE;
           side->children.push_back(module.ptr());
           vp->modules.push_back(module);
-          printout(INFO,"DeVeloStatic","Add Module[%03ld]:  %s",vp->modules.size()-1,path.c_str());
+          printout(DEBUG,"DeVeloStatic","Add Module[%03ld]:  %s",vp->modules.size()-1,path.c_str());
           break;
         case 3:
           support = cond;
@@ -86,7 +86,7 @@ void DeVeloStaticConditionCall::resolve(Condition c, Context& context)    {
           support->de_user |= DeVeloFlags::SUPPORT;
           vp->supports.push_back(support);
           module->children.push_back(support.ptr());
-          printout(INFO,"DeVeloStatic","Add Support[%03ld]:  %s",vp->supports.size()-1,path.c_str());
+          printout(DEBUG,"DeVeloStatic","Add Support[%03ld]: %s",vp->supports.size()-1,path.c_str());
           break;
         case 4:
           sens = cond;

examples/DDDB/src/plugins/DeVeloTest.cpp

@@ -128,7 +128,8 @@ namespace {
           dd4hep::Condition::detkey_type det_key = de.key();
           dd4hep::ConditionKey::KeyMaker lower(det_key, dd4hep::Condition::FIRST_ITEM_KEY);
           dd4hep::ConditionKey::KeyMaker upper(det_key, dd4hep::Condition::LAST_ITEM_KEY);
-          cout << "Processing " << e.second << " class " << cat->classID << "  -> " << de.path() << endl;
+          printout(DEBUG, "ServiceTest","Processing %ld class %d  -> %s",
+                   e.second, cat->classID, de.path().c_str());
           m_context->detectors.insert(make_pair(det_key,make_pair(de,cat)));
           {
             auto first = cont->conditions().lower_bound(lower.hash);