← Back to branch summary

~ubuntu-branches/ubuntu/edgy/ncbi-tools6/edgy

« back to all changes in this revision

Viewing changes to algo/blast/core/blast_psi.c

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese
  • Date: 2006-07-19 23:28:07 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060719232807-et3cdmcjgmnyleyx
Tags: 6.1.20060507-3ubuntu1
Re-merge with Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
algo/blast/core/blast_psi.c
1
1
#ifndef SKIP_DOXYGEN_PROCESSING
2
2
static char const rcsid[] =
3
 
    "$Id: blast_psi.c,v 1.30 2005/11/16 14:27:03 madden Exp $";
 
3
    "$Id: blast_psi.c,v 1.31 2006/04/19 19:16:49 camacho Exp $";
4
4
#endif /* SKIP_DOXYGEN_PROCESSING */
5
5
/* ===========================================================================
6
6
 *
144
144
        return status;
145
145
    }
146
146
 
147
 
    /*** Enable structure group customization if needed ***/
 
147
    /*** Enable structure group customization if needed and validate the
 
148
     * multiple sequence alignment data ***/
148
149
    if (options->nsg_compatibility_mode) {
149
 
        Uint4 i;
150
 
        for (i = 0; i < msa->dimensions->query_length; i++) {
151
 
            msa->cell[kQueryIndex][i].letter = 0;
152
 
            msa->cell[kQueryIndex][i].is_aligned = FALSE;
153
 
        }
154
 
        msa->use_sequence[kQueryIndex] = FALSE;
155
 
        _PSIUpdatePositionCounts(msa);
 
150
        _PSIStructureGroupCustomization(msa);
 
151
        status = _PSIValidateMSA_StructureGroup(msa);
156
152
    } else {
157
153
        status = _PSIValidateMSA(msa);
158
 
        if (status != PSI_SUCCESS) {
159
 
            s_PSICreatePssmCleanUp(pssm, msa, aligned_block, seq_weights,
160
 
                                  internal_pssm);
161
 
            return status;
162
 
        }
 
154
    }
 
155
    if (status != PSI_SUCCESS) {
 
156
        s_PSICreatePssmCleanUp(pssm, msa, aligned_block, seq_weights,
 
157
                              internal_pssm);
 
158
        return status;
163
159
    }
164
160
 
165
161
    status = _PSIComputeAlignmentBlocks(msa, aligned_block);