Skip to content

Commit 2cfedc1

Browse files
committed
Slightly improve detecting model of ORTEC detectors.
1 parent 377af0f commit 2cfedc1

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/SpecFile.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6503,7 +6503,8 @@ void SpecFile::set_detector_type_from_other_info()
65036503

65046504

65056505
//Lets try to figure out if we can fill out detector_type_
6506-
if( iequals_ascii( manufacturer_,"ORTEC" ) )
6506+
const bool manufacturer_is_ortec = icontains( manufacturer_, "ORTEC" );
6507+
if( manufacturer_is_ortec || (manufacturer_.empty() && icontains(instrument_model_,"Det")) )
65076508
{
65086509
if( iequals_ascii(instrument_model_,"OSASP") )
65096510
detector_type_ = DetectorType::DetectiveEx200;
@@ -6527,8 +6528,14 @@ void SpecFile::set_detector_type_from_other_info()
65276528
detector_type_ = DetectorType::DetectiveX;
65286529
else if( icontains(instrument_model_,"Detective") )
65296530
detector_type_ = DetectorType::DetectiveUnknown;
6530-
6531-
return;
6531+
6532+
if( manufacturer_is_ortec
6533+
|| ((detector_type_ != DetectorType::Unknown) && (detector_type_ != DetectorType::IdentiFinderUnknown)) )
6534+
{
6535+
if( manufacturer_.empty() )
6536+
manufacturer_ = "ORTEC";
6537+
return;
6538+
}
65326539
}//if( iequals_ascii( manufacturer_,"ORTEC" ) )
65336540

65346541

0 commit comments

Comments
 (0)