diff --git a/Framework/API/src/CompositeFunction.cpp b/Framework/API/src/CompositeFunction.cpp index 4d2a10d762cd27726e4ffc5440b1a0eab9608537..8deca8dda517111d7906cf074ef85c099711dfc0 100644 --- a/Framework/API/src/CompositeFunction.cpp +++ b/Framework/API/src/CompositeFunction.cpp @@ -73,7 +73,8 @@ std::string CompositeFunction::asString() const { } for (size_t i = 0; i < nFunctions(); i++) { IFunction_sptr fun = getFunction(i); - bool isComp = boost::dynamic_pointer_cast<CompositeFunction>(fun) != nullptr; + bool isComp = + boost::dynamic_pointer_cast<CompositeFunction>(fun) != nullptr; if (isComp) ostr << '('; ostr << fun->asString(); diff --git a/Framework/API/src/Sample.cpp b/Framework/API/src/Sample.cpp index be462d6074e3690fee9470a7e08ea31f58e8aeba..7961dcdf92d554ae96c2e3f76d07e34073d02baf 100644 --- a/Framework/API/src/Sample.cpp +++ b/Framework/API/src/Sample.cpp @@ -33,9 +33,10 @@ Sample::Sample() */ Sample::Sample(const Sample ©) : m_name(copy.m_name), m_shape(copy.m_shape), - m_environment(copy.m_environment), m_lattice(nullptr), m_crystalStructure(), - m_samples(copy.m_samples), m_geom_id(copy.m_geom_id), - m_thick(copy.m_thick), m_height(copy.m_height), m_width(copy.m_width) { + m_environment(copy.m_environment), m_lattice(nullptr), + m_crystalStructure(), m_samples(copy.m_samples), + m_geom_id(copy.m_geom_id), m_thick(copy.m_thick), m_height(copy.m_height), + m_width(copy.m_width) { if (copy.m_lattice) m_lattice = new OrientedLattice(copy.getOrientedLattice()); diff --git a/Framework/Algorithms/src/UnwrapSNS.cpp b/Framework/Algorithms/src/UnwrapSNS.cpp index bcb2ef387410a41bf981a8f04af02522dfdf9691..d7bb86b5cf34293cefed63d37c1f956cb08a872d 100644 --- a/Framework/Algorithms/src/UnwrapSNS.cpp +++ b/Framework/Algorithms/src/UnwrapSNS.cpp @@ -124,7 +124,7 @@ void UnwrapSNS::exec() { // go off and do the event version if appropriate m_inputEvWS = boost::dynamic_pointer_cast<const EventWorkspace>(m_inputWS); if ((m_inputEvWS != nullptr)) // && ! this->getProperty("ForceHist")) // TODO - // remove ForceHist option + // remove ForceHist option { this->execEvent(); return; diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp index 116bb1829f736f03c38802b200402d611adf8982..909a8dff8aa00b7aa2d8432a33fe3ff7ec459e29 100644 --- a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp +++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp @@ -90,8 +90,8 @@ DerivMinimizer::DerivMinimizer() * @param tolerance :: Tolerance. */ DerivMinimizer::DerivMinimizer(const double stepSize, const double tolerance) - : m_gslSolver(nullptr), m_x(nullptr), m_stopGradient(1e-3), m_stepSize(stepSize), - m_tolerance(tolerance) { + : m_gslSolver(nullptr), m_x(nullptr), m_stopGradient(1e-3), + m_stepSize(stepSize), m_tolerance(tolerance) { initGSLMMin(); } diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp index 351b553e85a2cf49b6585b3545310cc025324342..9ef6de3b6d888e04c9a64c1f8734746d5a32fbfe 100644 --- a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp +++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp @@ -42,8 +42,8 @@ double SimplexMinimizer::fun(const gsl_vector *x, void *params) { } SimplexMinimizer::SimplexMinimizer(const double epsabs) - : m_epsabs(epsabs), m_costFunction(), m_size(1.0), m_simplexStepSize(nullptr), - m_startGuess(nullptr), m_gslSolver(nullptr) { + : m_epsabs(epsabs), m_costFunction(), m_size(1.0), + m_simplexStepSize(nullptr), m_startGuess(nullptr), m_gslSolver(nullptr) { gslContainer.f = nullptr; gslContainer.n = -1; gslContainer.params = nullptr; diff --git a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp index 9af2254bf4c90b95fb99bd53e35719557fb8b058..0b7caa067b84e78553b74883884ccdeee4e662d3 100644 --- a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp +++ b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp @@ -202,15 +202,15 @@ static string generateMappingfileName(EventWorkspace_sptr &wksp) { */ FilterEventsByLogValuePreNexus::FilterEventsByLogValuePreNexus() : Mantid::API::IFileLoader<Kernel::FileDescriptor>(), m_prog(nullptr), - m_protonChargeTot(0), m_detid_max(0), m_eventFile(nullptr), m_numEvents(0), - m_numPulses(0), m_numPixel(0), m_numGoodEvents(0), m_numErrorEvents(0), - m_numBadEvents(0), m_numWrongdetidEvents(0), m_numIgnoredEvents(0), - m_firstEvent(0), m_maxNumEvents(0), m_usingMappingFile(false), - m_loadOnlySomeSpectra(false), m_longestTof(0.0), m_shortestTof(0.0), - m_parallelProcessing(false), m_pulseTimesIncreasing(false), - m_throwError(true), m_examEventLog(false), m_pixelid2exam(0), - m_numevents2write(0), m_freqHz(0), m_istep(0), m_dbPixelID(0), - m_useDBOutput(false), m_corretctTOF(false) {} + m_protonChargeTot(0), m_detid_max(0), m_eventFile(nullptr), + m_numEvents(0), m_numPulses(0), m_numPixel(0), m_numGoodEvents(0), + m_numErrorEvents(0), m_numBadEvents(0), m_numWrongdetidEvents(0), + m_numIgnoredEvents(0), m_firstEvent(0), m_maxNumEvents(0), + m_usingMappingFile(false), m_loadOnlySomeSpectra(false), + m_longestTof(0.0), m_shortestTof(0.0), m_parallelProcessing(false), + m_pulseTimesIncreasing(false), m_throwError(true), m_examEventLog(false), + m_pixelid2exam(0), m_numevents2write(0), m_freqHz(0), m_istep(0), + m_dbPixelID(0), m_useDBOutput(false), m_corretctTOF(false) {} //---------------------------------------------------------------------------------------------- /** Desctructor diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp index d1f07ac1936b597446c2b90565cb9867ed05f983..ad5d9fd85d4c63cf2d3bf466e534d0c43e09fe5a 100644 --- a/Framework/DataHandling/src/LoadEventNexus.cpp +++ b/Framework/DataHandling/src/LoadEventNexus.cpp @@ -485,8 +485,9 @@ public: // m_loadError(false), prog(prog), scheduler(scheduler), m_loadError(false), m_oldNexusFileNames(oldNeXusFileNames), m_loadStart(), m_loadSize(), - m_event_id(nullptr), m_event_time_of_flight(nullptr), m_have_weight(false), - m_event_weight(nullptr), m_framePeriodNumbers(framePeriodNumbers) { + m_event_id(nullptr), m_event_time_of_flight(nullptr), + m_have_weight(false), m_event_weight(nullptr), + m_framePeriodNumbers(framePeriodNumbers) { setMutex(ioMutex); m_cost = static_cast<double>(numEvents); m_min_id = std::numeric_limits<uint32_t>::max(); diff --git a/Framework/DataHandling/src/LoadMask.cpp b/Framework/DataHandling/src/LoadMask.cpp index 2f1cb21d26b9941c7238646984305cefd06fed1e..b11d4baa38d90000c8ef078411b7f611f4089fe2 100644 --- a/Framework/DataHandling/src/LoadMask.cpp +++ b/Framework/DataHandling/src/LoadMask.cpp @@ -45,8 +45,8 @@ DECLARE_ALGORITHM(LoadMask) /** Constructor */ LoadMask::LoadMask() - : m_maskWS(), m_instrumentPropValue(""), m_pDoc(nullptr), m_pRootElem(nullptr), - m_defaultToUse(true) {} + : m_maskWS(), m_instrumentPropValue(""), m_pDoc(nullptr), + m_pRootElem(nullptr), m_defaultToUse(true) {} //---------------------------------------------------------------------------------------------- /** Destructor diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.cpp b/Framework/DataHandling/src/LoadRaw/isisraw.cpp index ac3a73ec1f4da4ee2097ecb3b9903543777a9404..7abf617c48d11bcb38c47d9703cabd936ef50b55 100644 --- a/Framework/DataHandling/src/LoadRaw/isisraw.cpp +++ b/Framework/DataHandling/src/LoadRaw/isisraw.cpp @@ -135,11 +135,12 @@ int ISISRAW::addItems() { /// stuff ISISRAW::ISISRAW(ISISCRPT_STRUCT *crpt) : m_crpt(crpt), frmt_ver_no(0), data_format(0), ver2(0), r_number(0), - ver3(0), i_det(0), i_mon(0), i_use(0), mdet(nullptr), monp(nullptr), spec(nullptr), delt(nullptr), - len2(nullptr), code(nullptr), tthe(nullptr), ut(nullptr), ver4(0), ver5(0), crat(nullptr), modn(nullptr), - mpos(nullptr), timr(nullptr), udet(nullptr), ver6(0), t_ntrg(0), t_nfpp(0), t_nper(0), - t_nsp1(0), t_ntc1(0), t_pre1(0), t_tcb1(nullptr), ver7(0), u_dat(nullptr), ver8(0), - ddes(nullptr), dat1(nullptr) { + ver3(0), i_det(0), i_mon(0), i_use(0), mdet(nullptr), monp(nullptr), + spec(nullptr), delt(nullptr), len2(nullptr), code(nullptr), tthe(nullptr), + ut(nullptr), ver4(0), ver5(0), crat(nullptr), modn(nullptr), + mpos(nullptr), timr(nullptr), udet(nullptr), ver6(0), t_ntrg(0), + t_nfpp(0), t_nper(0), t_nsp1(0), t_ntc1(0), t_pre1(0), t_tcb1(nullptr), + ver7(0), u_dat(nullptr), ver8(0), ddes(nullptr), dat1(nullptr) { memset(r_title, ' ', sizeof(r_title)); memset(i_inst, ' ', sizeof(i_inst)); for (int i = 0; i < 256; i++) { @@ -160,11 +161,12 @@ ISISRAW::ISISRAW(ISISCRPT_STRUCT *crpt) /// stuff ISISRAW::ISISRAW(ISISCRPT_STRUCT *crpt, bool doUpdateFromCRPT) : m_crpt(crpt), frmt_ver_no(0), data_format(0), ver2(0), r_number(0), - ver3(0), i_det(0), i_mon(0), i_use(0), mdet(nullptr), monp(nullptr), spec(nullptr), delt(nullptr), - len2(nullptr), code(nullptr), tthe(nullptr), ut(nullptr), ver4(0), ver5(0), crat(nullptr), modn(nullptr), - mpos(nullptr), timr(nullptr), udet(nullptr), ver6(0), t_ntrg(0), t_nfpp(0), t_nper(0), - t_nsp1(0), t_ntc1(0), t_pre1(0), t_tcb1(nullptr), ver7(0), u_dat(nullptr), ver8(0), - ddes(nullptr), dat1(nullptr) { + ver3(0), i_det(0), i_mon(0), i_use(0), mdet(nullptr), monp(nullptr), + spec(nullptr), delt(nullptr), len2(nullptr), code(nullptr), tthe(nullptr), + ut(nullptr), ver4(0), ver5(0), crat(nullptr), modn(nullptr), + mpos(nullptr), timr(nullptr), udet(nullptr), ver6(0), t_ntrg(0), + t_nfpp(0), t_nper(0), t_nsp1(0), t_ntc1(0), t_pre1(0), t_tcb1(nullptr), + ver7(0), u_dat(nullptr), ver8(0), ddes(nullptr), dat1(nullptr) { memset(r_title, ' ', sizeof(r_title)); memset(i_inst, ' ', sizeof(i_inst)); for (int i = 0; i < 256; i++) { diff --git a/Framework/Geometry/src/Instrument.cpp b/Framework/Geometry/src/Instrument.cpp index c9415942c81d55da0154cda4d0db2af956b9ddaa..e614b30f57acbf51db5d015f9adfa0f6c6f6d246 100644 --- a/Framework/Geometry/src/Instrument.cpp +++ b/Framework/Geometry/src/Instrument.cpp @@ -20,15 +20,15 @@ Kernel::Logger g_log("Instrument"); /// Default constructor Instrument::Instrument() : CompAssembly(), m_detectorCache(), m_sourceCache(nullptr), - m_chopperPoints(new std::vector<const ObjComponent *>), m_sampleCache(nullptr), - m_defaultView("3D"), m_defaultViewAxis("Z+"), + m_chopperPoints(new std::vector<const ObjComponent *>), + m_sampleCache(nullptr), m_defaultView("3D"), m_defaultViewAxis("Z+"), m_referenceFrame(new ReferenceFrame) {} /// Constructor with name Instrument::Instrument(const std::string &name) : CompAssembly(name), m_detectorCache(), m_sourceCache(nullptr), - m_chopperPoints(new std::vector<const ObjComponent *>), m_sampleCache(nullptr), - m_defaultView("3D"), m_defaultViewAxis("Z+"), + m_chopperPoints(new std::vector<const ObjComponent *>), + m_sampleCache(nullptr), m_defaultView("3D"), m_defaultViewAxis("Z+"), m_referenceFrame(new ReferenceFrame) {} /** Constructor to create a parametrized instrument diff --git a/Framework/Geometry/src/Instrument/Component.cpp b/Framework/Geometry/src/Instrument/Component.cpp index 4d3672ac85fb7ed071eb629e12749f731b506aaa..5705a2c9f4628db2025e40491a9818aecfb8979b 100644 --- a/Framework/Geometry/src/Instrument/Component.cpp +++ b/Framework/Geometry/src/Instrument/Component.cpp @@ -28,7 +28,8 @@ Component::Component(const IComponent *base, const ParameterMap *map) * Create a component with null parent */ Component::Component() - : m_parent(nullptr), m_base(nullptr), m_map(nullptr), m_name(), m_pos(), m_rot() {} + : m_parent(nullptr), m_base(nullptr), m_map(nullptr), m_name(), m_pos(), + m_rot() {} /** Constructor by value * @param name :: Component name diff --git a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp index dddd4aacc0a1817465182a8f419a748abe6bb9a2..b12692978124028fbc5da9efc1ce80134f54a97c 100644 --- a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp +++ b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp @@ -2428,8 +2428,8 @@ void InstrumentDefinitionParser::adjust( // create dummy component to hold coord. sys. of cuboid CompAssembly *baseCoor = new CompAssembly( "base"); // dummy assembly used to get to end assembly if nested - ICompAssembly *endComponent = - nullptr; // end assembly, its purpose is to hold the shape coordinate system + ICompAssembly *endComponent = nullptr; // end assembly, its purpose is to + // hold the shape coordinate system // get shape coordinate system, returned as endComponent, as defined by pLoc // and nested <location> elements // of pLoc diff --git a/Framework/Geometry/src/Instrument/RectangularDetector.cpp b/Framework/Geometry/src/Instrument/RectangularDetector.cpp index 6fe38e93749cca266bf246ffa29b4fa54898e57f..d0803ce7f6a6253d6101b444e05bc1067e4ee3f3 100644 --- a/Framework/Geometry/src/Instrument/RectangularDetector.cpp +++ b/Framework/Geometry/src/Instrument/RectangularDetector.cpp @@ -21,8 +21,8 @@ using Kernel::Matrix; /** Empty constructor */ RectangularDetector::RectangularDetector() - : CompAssembly(), IObjComponent(nullptr), m_rectBase(nullptr), m_minDetId(0), - m_maxDetId(0) { + : CompAssembly(), IObjComponent(nullptr), m_rectBase(nullptr), + m_minDetId(0), m_maxDetId(0) { init(); setGeometryHandler(new BitmapGeometryHandler(this)); diff --git a/Framework/Geometry/src/Objects/ShapeFactory.cpp b/Framework/Geometry/src/Objects/ShapeFactory.cpp index a28a9bea6392357a3cc226173de3b39e39098e5c..3f8b9a9d492b3be9a935250fd7fcecfaddfa3d60 100644 --- a/Framework/Geometry/src/Objects/ShapeFactory.cpp +++ b/Framework/Geometry/src/Objects/ShapeFactory.cpp @@ -149,8 +149,8 @@ boost::shared_ptr<Object> ShapeFactory::createShape(Poco::XML::Element *pElem) { // from int > zero. Element *lastElement = nullptr; // This is to store element for the fixed - // complete objects such as sphere,cone,cylinder - // and cuboid + // complete objects such as sphere,cone,cylinder + // and cuboid for (unsigned int i = 0; i < pNL_length; i++) { if ((pNL->item(i))->nodeType() == Node::ELEMENT_NODE) { Element *pE = static_cast<Element *>(pNL->item(i)); diff --git a/Framework/ICat/src/CatalogDownloadDataFiles.cpp b/Framework/ICat/src/CatalogDownloadDataFiles.cpp index d1c975b24e493bb97073d39e9fee6cd7eb987098..c9d5b68684964b3abf110a848415c6cf396ddd43 100644 --- a/Framework/ICat/src/CatalogDownloadDataFiles.cpp +++ b/Framework/ICat/src/CatalogDownloadDataFiles.cpp @@ -162,8 +162,8 @@ std::string CatalogDownloadDataFiles::doDownloadandSavetoLocalDrive( Poco::Net::Context::VERIFY_NONE); // Create a singleton for holding the default context. E.g. any future // requests to publish are made to this certificate and context. - Poco::Net::SSLManager::instance().initializeClient(nullptr, certificateHandler, - context); + Poco::Net::SSLManager::instance().initializeClient( + nullptr, certificateHandler, context); // Session takes ownership of socket Poco::Net::SecureStreamSocket *socket = diff --git a/Framework/ICat/src/CatalogPublish.cpp b/Framework/ICat/src/CatalogPublish.cpp index 80a8c4842fef439d8901b8400d1f2490fb899ad6..8849694fa40c07021d23925d5e2619656a1ee318 100644 --- a/Framework/ICat/src/CatalogPublish.cpp +++ b/Framework/ICat/src/CatalogPublish.cpp @@ -152,8 +152,8 @@ void CatalogPublish::publish(std::istream &fileContents, Poco::Net::Context::VERIFY_NONE); // Create a singleton for holding the default context. E.g. any future // requests to publish are made to this certificate and context. - Poco::Net::SSLManager::instance().initializeClient(nullptr, certificateHandler, - context); + Poco::Net::SSLManager::instance().initializeClient( + nullptr, certificateHandler, context); Poco::Net::HTTPSClientSession session(uri.getHost(), uri.getPort(), context); diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp index da457b8236c1c74029e870d28d8a5cd9c927ec09..e07aba5fb7a741d9c34543ea053c8d4ca34c2ab3 100644 --- a/Framework/Kernel/src/ConfigService.cpp +++ b/Framework/Kernel/src/ConfigService.cpp @@ -141,9 +141,9 @@ private: /// Private constructor for singleton class ConfigServiceImpl::ConfigServiceImpl() - : m_pConf(nullptr), m_pSysConfig(nullptr), m_changed_keys(), m_ConfigPaths(), - m_AbsolutePaths(), m_strBaseDir(""), m_PropertyString(""), - m_properties_file_name("Mantid.properties"), + : m_pConf(nullptr), m_pSysConfig(nullptr), m_changed_keys(), + m_ConfigPaths(), m_AbsolutePaths(), m_strBaseDir(""), + m_PropertyString(""), m_properties_file_name("Mantid.properties"), #ifdef MPI_BUILD // Use a different user properties file for an mpi-enabled build to avoid // confusion if both are used on the same file system diff --git a/Framework/Kernel/src/InternetHelper.cpp b/Framework/Kernel/src/InternetHelper.cpp index 7f1618aa3d5b12230ab2dd5a9d7e658b1b949613..e6f6f0a895da960dd217d2161547df95829b768f 100644 --- a/Framework/Kernel/src/InternetHelper.cpp +++ b/Framework/Kernel/src/InternetHelper.cpp @@ -54,8 +54,8 @@ Logger g_log("InternetHelper"); InternetHelper::InternetHelper() : m_proxyInfo(), m_isProxySet(false), m_timeout(30), m_isTimeoutSet(false), m_contentLength(0), m_method(HTTPRequest::HTTP_GET), - m_contentType("application/json"), m_body(), m_headers(), m_request(nullptr), - m_response(nullptr) {} + m_contentType("application/json"), m_body(), m_headers(), + m_request(nullptr), m_response(nullptr) {} //---------------------------------------------------------------------------------------------- /** Constructor @@ -248,7 +248,8 @@ int InternetHelper::sendHTTPSRequest(const std::string &url, // Create a singleton for holding the default context. // e.g. any future requests to publish are made to this certificate and // context. - SSLManager::instance().initializeClient(nullptr, certificateHandler, context); + SSLManager::instance().initializeClient(nullptr, certificateHandler, + context); // Create the session HTTPSClientSession session(uri.getHost(), static_cast<Poco::UInt16>(uri.getPort())); diff --git a/Framework/Kernel/src/NetworkProxyOSX.cpp b/Framework/Kernel/src/NetworkProxyOSX.cpp index 4dcd0e0d9d3c07fe36b928f6b995ff0e8e5eea63..57431ba8f4dc075266bea21b407a708b258cb9b9 100644 --- a/Framework/Kernel/src/NetworkProxyOSX.cpp +++ b/Framework/Kernel/src/NetworkProxyOSX.cpp @@ -110,8 +110,9 @@ ProxyInfoVec proxyInformationFromPac(CFDictionaryRef dict, CFURLRef pacURL = CFURLCreateWithString(kCFAllocatorDefault, cfPacLocation, nullptr); SInt32 errorCode; - if (!CFURLCreateDataAndPropertiesFromResource( - kCFAllocatorDefault, pacURL, &pacData, nullptr, nullptr, &errorCode)) { + if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, pacURL, + &pacData, nullptr, nullptr, + &errorCode)) { logger.debug() << "Unable to get the PAC script at " << toString(cfPacLocation) << "Error code: " << errorCode << std::endl; diff --git a/Framework/MDAlgorithms/src/BinMD.cpp b/Framework/MDAlgorithms/src/BinMD.cpp index 77eced2e40ac446759c76af8486672d7849f2e98..1d2bcbe8110037f86cc447f78ee8dafdd434e9a5 100644 --- a/Framework/MDAlgorithms/src/BinMD.cpp +++ b/Framework/MDAlgorithms/src/BinMD.cpp @@ -35,8 +35,9 @@ using namespace Mantid::DataObjects; /** Constructor */ BinMD::BinMD() - : outWS(), prog(nullptr), implicitFunction(nullptr), indexMultiplier(nullptr), - signals(nullptr), errors(nullptr), numEvents(nullptr) {} + : outWS(), prog(nullptr), implicitFunction(nullptr), + indexMultiplier(nullptr), signals(nullptr), errors(nullptr), + numEvents(nullptr) {} //---------------------------------------------------------------------------------------------- /** Destructor diff --git a/Framework/MDAlgorithms/src/ConvToMDEventsWS.cpp b/Framework/MDAlgorithms/src/ConvToMDEventsWS.cpp index f37307581c9d0b5dc0932a54bc8d4bb14c7e378c..a55b0980ab61cc8037c124f030ba9f524accff4b 100644 --- a/Framework/MDAlgorithms/src/ConvToMDEventsWS.cpp +++ b/Framework/MDAlgorithms/src/ConvToMDEventsWS.cpp @@ -170,8 +170,9 @@ void ConvToMDEventsWS::runConversion(API::Progress *pProgress) { tp.joinAll(); } else { m_OutWSWrapper->pWorkspace()->splitAllIfNeeded( - nullptr); // it is done this way as it is possible trying to do single - // threaded split more efficiently + nullptr); // it is done this way as it is possible trying to do + // single + // threaded split more efficiently } // Count the new # of boxes. lastNumBoxes = m_OutWSWrapper->pWorkspace() diff --git a/Framework/MDAlgorithms/src/ConvToMDHistoWS.cpp b/Framework/MDAlgorithms/src/ConvToMDHistoWS.cpp index fa08c5dcd099eef627d4719a7b12f362cad72f8c..28052eae3ee37c212e35419f0679a795e518ba6b 100644 --- a/Framework/MDAlgorithms/src/ConvToMDHistoWS.cpp +++ b/Framework/MDAlgorithms/src/ConvToMDHistoWS.cpp @@ -222,8 +222,9 @@ void ConvToMDHistoWS::runConversion(API::Progress *pProgress) { tp.joinAll(); } else { m_OutWSWrapper->pWorkspace()->splitAllIfNeeded( - nullptr); // it is done this way as it is possible trying to do single - // threaded split more efficiently + nullptr); // it is done this way as it is possible trying to do + // single + // threaded split more efficiently } // Count the new # of boxes. lastNumBoxes = bc->getTotalNumMDBoxes(); diff --git a/Framework/MDAlgorithms/src/MDTransfModQ.cpp b/Framework/MDAlgorithms/src/MDTransfModQ.cpp index 197acc853fc35fc63177438f7f4124a4beddf4c8..ff74b29c7beff2304ff82b38e1f9dcac40acfab3 100644 --- a/Framework/MDAlgorithms/src/MDTransfModQ.cpp +++ b/Framework/MDAlgorithms/src/MDTransfModQ.cpp @@ -403,8 +403,8 @@ MDTransfModQ::outputUnitID(Kernel::DeltaEMode::Type dEmode, /// constructor; MDTransfModQ::MDTransfModQ() : m_ex(0), m_ey(0), m_ez(1), m_DetDirecton(nullptr), //,m_NMatrixDim(-1) - m_NMatrixDim(0), // uninitialized - m_Emode(Kernel::DeltaEMode::Undefined), // uninitialized + m_NMatrixDim(0), // uninitialized + m_Emode(Kernel::DeltaEMode::Undefined), // uninitialized m_Ki(1.), m_Ei(1.), m_pEfixedArray(nullptr), m_pDetMasks(nullptr) {} std::vector<std::string> MDTransfModQ::getEmodes() const { diff --git a/Framework/MDAlgorithms/src/MDTransfNoQ.cpp b/Framework/MDAlgorithms/src/MDTransfNoQ.cpp index 00b5e1d76f1ae073dc006c3dd553b90632a6940a..adc82b768d9e28280840de1e461164421a517d3f 100644 --- a/Framework/MDAlgorithms/src/MDTransfNoQ.cpp +++ b/Framework/MDAlgorithms/src/MDTransfNoQ.cpp @@ -180,7 +180,8 @@ MDTransfNoQ::inputUnitID(Kernel::DeltaEMode::Type mode, return pXAxis->unit()->unitID(); } -MDTransfNoQ::MDTransfNoQ() : m_NMatrixDim(0), m_YAxis(nullptr), m_Det(nullptr) {} +MDTransfNoQ::MDTransfNoQ() + : m_NMatrixDim(0), m_YAxis(nullptr), m_Det(nullptr) {} /** * Set the display normalization for no Q diff --git a/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitYVector.cpp b/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitYVector.cpp index c6e8346f3810726b28e10e7057e5d385549221f8..b58b43c5b77cabb898275eadf1ea8a4ad7f6e9ae 100644 --- a/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitYVector.cpp +++ b/Framework/MDAlgorithms/src/Quantification/Resolution/TobyFitYVector.cpp @@ -29,9 +29,10 @@ unsigned int TobyFitYVector::length() { return 11; } */ TobyFitYVector::TobyFitYVector() : m_yvector(length(), 0.0), m_curRandNums(nullptr), m_randIndex(0), - m_curObs(nullptr), m_curQOmega(nullptr), m_moderator(true), m_aperture(true), - m_chopper(true), m_chopperJitter(true), m_sampleVolume(true), - m_detectorDepth(true), m_detectorArea(true), m_detectionTime(true) {} + m_curObs(nullptr), m_curQOmega(nullptr), m_moderator(true), + m_aperture(true), m_chopper(true), m_chopperJitter(true), + m_sampleVolume(true), m_detectorDepth(true), m_detectorArea(true), + m_detectionTime(true) {} /** * Adds the attributes from the vector to the given model diff --git a/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp b/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp index cfc787c852a157b2787b45b60fb72cf8d1e2213e..ea8eee2482f483ffd7835a960673688e15e88a86 100644 --- a/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp +++ b/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp @@ -67,8 +67,8 @@ Kernel::Logger g_log("ResolutionConvolvedCrossSection"); * Constructor */ ResolutionConvolvedCrossSection::ResolutionConvolvedCrossSection() - : ParamFunction(), IFunctionMD(), m_simulation(false), m_convolution(nullptr), - m_inputWS() {} + : ParamFunction(), IFunctionMD(), m_simulation(false), + m_convolution(nullptr), m_inputWS() {} /** * Destructor diff --git a/Framework/MDAlgorithms/src/SliceMD.cpp b/Framework/MDAlgorithms/src/SliceMD.cpp index af305a7a0e626d7dfe1fa47c59bfa51cad0b2940..9cc4af91aca59f1b54a90364067aeb9980988b1d 100644 --- a/Framework/MDAlgorithms/src/SliceMD.cpp +++ b/Framework/MDAlgorithms/src/SliceMD.cpp @@ -185,7 +185,8 @@ void SliceMD::slice(typename MDEventWorkspace<MDE, nd>::sptr ws) { // Function defining which events (in the input dimensions) to place in the // output - MDImplicitFunction *function = this->getImplicitFunctionForChunk(nullptr, nullptr); + MDImplicitFunction *function = + this->getImplicitFunctionForChunk(nullptr, nullptr); std::vector<API::IMDNode *> boxes; // Leaf-only; no depth limit; with the implicit function passed to it. diff --git a/Framework/Nexus/src/NexusFileIO.cpp b/Framework/Nexus/src/NexusFileIO.cpp index fd41f17daaf35cb282659af35126a065cd9dbf1c..b2c1e317f387b8294006706100e6e156ffaef3ad 100644 --- a/Framework/Nexus/src/NexusFileIO.cpp +++ b/Framework/Nexus/src/NexusFileIO.cpp @@ -36,8 +36,8 @@ Logger g_log("NexusFileIO"); /// Empty default constructor NexusFileIO::NexusFileIO() - : fileID(), m_filehandle(), m_nexuscompression(NX_COMP_LZW), m_progress(nullptr), - m_filename() {} + : fileID(), m_filehandle(), m_nexuscompression(NX_COMP_LZW), + m_progress(nullptr), m_filename() {} /// Constructor that supplies a progress object NexusFileIO::NexusFileIO(Progress *prog) diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp index 7657ed3f22a484d779f078433c746894656ff856..42770b9fafce2d871b162f57e44ed08b32e5607c 100644 --- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp +++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp @@ -206,7 +206,8 @@ std::string createDocString(IAlgorithm &self) { */ struct AllowCThreads { explicit AllowCThreads(const object &algm) - : m_tracefunc(nullptr), m_tracearg(nullptr), m_saved(nullptr), m_tracking(false) { + : m_tracefunc(nullptr), m_tracearg(nullptr), m_saved(nullptr), + m_tracking(false) { PyThreadState *curThreadState = PyThreadState_GET(); m_tracefunc = curThreadState->c_tracefunc; m_tracearg = curThreadState->c_traceobj; diff --git a/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp b/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp index 539b2abb160910e877c1707448e6d5ff417c81f8..439a9608a19f49ba4ed349b8fb9d3e894011ed86 100644 --- a/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp +++ b/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/AlgorithmAdapter.cpp @@ -22,7 +22,8 @@ using Environment::CallMethod0; */ template <typename BaseAlgorithm> AlgorithmAdapter<BaseAlgorithm>::AlgorithmAdapter(PyObject *self) - : BaseAlgorithm(), m_self(self), m_isRunningObj(nullptr), m_wikiSummary("") { + : BaseAlgorithm(), m_self(self), m_isRunningObj(nullptr), + m_wikiSummary("") { // Cache the isRunning call to save the lookup each time it is called // as it is most likely called in a loop diff --git a/Framework/TestHelpers/src/ComponentCreationHelper.cpp b/Framework/TestHelpers/src/ComponentCreationHelper.cpp index c90770d1eec9190d3457df961f68e6796fc93936..5b2d92a32486f39424b390a6e8217e41273965df 100644 --- a/Framework/TestHelpers/src/ComponentCreationHelper.cpp +++ b/Framework/TestHelpers/src/ComponentCreationHelper.cpp @@ -223,7 +223,8 @@ createRingOfCylindricalDetectors(const double R_min, const double R_max, if (Rsq >= Rmin2 && Rsq < Rmax2) { std::ostringstream os; os << "d" << ic; - auto det = boost::make_shared<Detector>(os.str(), ic + 1, detShape, nullptr); + auto det = + boost::make_shared<Detector>(os.str(), ic + 1, detShape, nullptr); det->setPos(x, y, z0); groupMembers.push_back(det); } diff --git a/Framework/TestHelpers/src/MDEventsTestHelper.cpp b/Framework/TestHelpers/src/MDEventsTestHelper.cpp index e7f60a1676a124d84abaea8c19363c9992ee1505..47682fd4eb8cda0c9a529a2f21f05eff9df767ca 100644 --- a/Framework/TestHelpers/src/MDEventsTestHelper.cpp +++ b/Framework/TestHelpers/src/MDEventsTestHelper.cpp @@ -256,7 +256,8 @@ makeFakeMDHistoWorkspaceGeneral(size_t numDims, double signal, dimensions.push_back(MDHistoDimension_sptr(new MDHistoDimension( names[d], names[d], frame, min[d], max[d], numBins[d]))); - MDHistoWorkspace_sptr ws_sptr = boost::make_shared<MDHistoWorkspace>(dimensions); + MDHistoWorkspace_sptr ws_sptr = + boost::make_shared<MDHistoWorkspace>(dimensions); ws_sptr->setTo(signal, errorSquared, 1.0 /* num events */); if (!name.empty()) AnalysisDataService::Instance().addOrReplace(name, ws_sptr); @@ -289,7 +290,8 @@ MDHistoWorkspace_sptr makeFakeMDHistoWorkspaceGeneral( dimensions.push_back(MDHistoDimension_sptr(new MDHistoDimension( names[d], names[d], frame, min[d], max[d], numBins[d]))); - MDHistoWorkspace_sptr ws_sptr = boost::make_shared<MDHistoWorkspace>(dimensions); + MDHistoWorkspace_sptr ws_sptr = + boost::make_shared<MDHistoWorkspace>(dimensions); ws_sptr->setTo(signal, errorSquared, 1.0 /* num events */); if (!name.empty()) AnalysisDataService::Instance().addOrReplace(name, ws_sptr); @@ -314,27 +316,36 @@ Mantid::DataObjects::MDHistoWorkspace_sptr makeFakeMDHistoWorkspaceWithMDFrame( double signal, size_t numDims, const Mantid::Geometry::MDFrame &frame, size_t numBins, coord_t max, double errorSquared, std::string name, double numEvents) { - //MDHistoWorkspace *ws = nullptr; + // MDHistoWorkspace *ws = nullptr; MDHistoWorkspace_sptr ws_sptr; if (numDims == 1) { - ws_sptr = boost::make_shared<MDHistoWorkspace>(boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, numBins)); + ws_sptr = boost::make_shared<MDHistoWorkspace>( + boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, + numBins)); } else if (numDims == 2) { - ws_sptr = boost::make_shared<MDHistoWorkspace>(boost::make_shared<MDHistoDimension>( - "x", "x", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>( - "y", "y", frame, 0.0, max, numBins)); + ws_sptr = boost::make_shared<MDHistoWorkspace>( + boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("y", "y", frame, 0.0, max, + numBins)); } else if (numDims == 3) { - ws_sptr = boost::make_shared<MDHistoWorkspace>(boost::make_shared<MDHistoDimension>( - "x", "x", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>( - "y", "y", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>( - "z", "z", frame, 0.0, max, numBins)); + ws_sptr = boost::make_shared<MDHistoWorkspace>( + boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("y", "y", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("z", "z", frame, 0.0, max, + numBins)); } else if (numDims == 4) { - ws_sptr = boost::make_shared<MDHistoWorkspace>(boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>("y", "y", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>("z", "z", frame, 0.0, max, numBins), - boost::make_shared<MDHistoDimension>("t", "t", frame, 0.0, max, numBins)); + ws_sptr = boost::make_shared<MDHistoWorkspace>( + boost::make_shared<MDHistoDimension>("x", "x", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("y", "y", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("z", "z", frame, 0.0, max, + numBins), + boost::make_shared<MDHistoDimension>("t", "t", frame, 0.0, max, + numBins)); } if (!ws_sptr)