SADSDADDSDSD

diff --git a/src/dssptools.cpp b/src/dssptools.cpp
index beac203dfd0f6fb0f90f960d007382e70a7a56f5..c90fe716c7105c7922214a200c6416f71e0a3177 100644 (file)
--- a/src/dssptools.cpp
+++ b/src/dssptools.cpp
@@ -255,9 +255,9 @@ void secondaryStructures::analyzeTurnsAndHelicesPatterns(){
         std::cout << "Testing Helix_" << static_cast<std::size_t>(i) + 3 << std::endl;
         std::size_t stride {static_cast<std::size_t>(i) + 3};
         for(std::size_t j {0}; j + static_cast<std::size_t>(i) < SecondaryStructuresStatusMap.size(); ++j){
-            std::cout << "Testing " << j << " and " << j + stride << std::endl;
+//            std::cout << "Testing " << j << " and " << j + stride << std::endl;
             if ( hasHBondBetween(j, j + (static_cast<std::size_t>(i))) && NoChainBreaksBetween(j, j + stride) ){
-                std::cout << j << " and " << j + stride << " has hbond!" << std::endl;
+//                std::cout << j << " and " << j + stride << " has hbond!" << std::endl;
                 SecondaryStructuresStatusMap[j + static_cast<std::size_t>(i)].setStatus(HelixPositions::End, i);
 
                 for (std::size_t k {1}; k < (static_cast<std::size_t>(i)); ++k){
@@ -293,17 +293,16 @@ void secondaryStructures::analyzeTurnsAndHelicesPatterns(){
                     break;
                 case turnsTypes::Turn_5:
                     for (std::size_t k {0}; empty && k < stride; ++k){
-                        empty = SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Loop ) || SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_5) || (PiHelixPreference && SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_5));
+                        empty = SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Loop ) || SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_5) || (PiHelixPreference && SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_4)); //TODO
                     }
-                    Helix = secondaryStructureTypes::Helix_4;
+                    Helix = secondaryStructureTypes::Helix_5;
                     break;
                 default:
                     Helix = secondaryStructureTypes::Helix_4;
                     break;
                 }
-                std::cout << j << " is HELIX" << std::endl;
-                if ( empty ){
-                    for(std::size_t k {0}; k < (static_cast<std::size_t>(i)); ++k ){
+                if ( empty || Helix == secondaryStructureTypes::Helix_4 ){
+                    for(std::size_t k {0}; k < stride ; ++k ){
                         SecondaryStructuresStatusMap[j + k].setStatus(Helix);
                     }
                 }