Preserve ticker for unchanged ("all", symbol) mask.

Do not advance ticker in a repeated call of
PairQuantity::setTypeMask("all", smbl, mask) as it does not
change the effective mask.

Author: pavoljuhas

src/diffpy/srreal/PairQuantity.cpp

@@ -300,11 +300,14 @@ setTypeMask(string smbli, string smblj, bool mask)
     {
         const string& sk = (ALLATOMSSTR != smbli) ? smbli : smblj;
         TypeMaskStorage::iterator tpmsk;
+        TypeMaskStorage::iterator skip = mtypemask.find(smblij);
         for (tpmsk = mtypemask.begin(); tpmsk != mtypemask.end();)
         {
-            if (sk == tpmsk->first.first || sk == tpmsk->first.second)
+            const bool eraseitem = (tpmsk != skip) &&
+                (sk == tpmsk->first.first || sk == tpmsk->first.second);
+            if (eraseitem)
             {
-                modified = true;
+                if (mask != tpmsk->second)  modified = true;
                 tpmsk = mtypemask.erase(tpmsk);
             }
             else  ++tpmsk;

src/tests/TestPairCounter.hpp

@@ -108,15 +108,23 @@ class TestPairCounter : public CxxTest::TestSuite
         pcount.setTypeMask("A", "B", false);
         EventTicker et2 = pcount.ticker();
         TS_ASSERT_LESS_THAN(et1, et2);
-        pcount.setPairMask(0, 0, false);
+        pcount.setTypeMask("A", "all", false);
         EventTicker et3 = pcount.ticker();
         TS_ASSERT_LESS_THAN(et2, et3);
-        pcount.setPairMask(0, 0, false);
+        pcount.setTypeMask("A", "all", false);
         TS_ASSERT_EQUALS(et3, pcount.ticker());
+        pcount.setTypeMask("A", "all", true);
+        EventTicker et4 = pcount.ticker();
+        TS_ASSERT_LESS_THAN(et3, et4);
+        pcount.setPairMask(0, 0, false);
+        EventTicker et5 = pcount.ticker();
+        TS_ASSERT_LESS_THAN(et4, et5);
+        pcount.setPairMask(0, 0, false);
+        TS_ASSERT_EQUALS(et5, pcount.ticker());
         pcount.setPairMask(0, 5, true);
-        TS_ASSERT_EQUALS(et3, pcount.ticker());
+        TS_ASSERT_EQUALS(et5, pcount.ticker());
         pcount.setPairMask(0, 5, false);
-        TS_ASSERT_LESS_THAN(et3, pcount.ticker());
+        TS_ASSERT_LESS_THAN(et5, pcount.ticker());
     }