X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=PairedEndModel.h;h=6e0f1a4fb385f7dbc53f904c85c95508f7f933a8;hb=53e8bbb15e0bfed6a0caae7b5ba6777a9a942266;hp=acd9f30a2b32ba0a3c30edf3104aa0e85f2a8c0e;hpb=a95154919f950f86de9104b2b9dcf1f0c7e83387;p=rsem.git

diff --git a/PairedEndModel.h b/PairedEndModel.h
index acd9f30..6e0f1a4 100644
--- a/PairedEndModel.h
+++ b/PairedEndModel.h
@@ -59,11 +59,11 @@ public:
 		mw = NULL;
 
 		if (isMaster) {
-			ori = new Orientation(params.probF);
 			if (!estRSPD) rspd = new RSPD(estRSPD);
 			mld = new LenDist(params.mate_minL, params.mate_maxL);
 		}
 
+		ori = new Orientation(params.probF);
 		gld = new LenDist(params.minL, params.maxL);
 		if (estRSPD) rspd = new RSPD(estRSPD, params.B);
 		pro = new Profile(params.maxL);
@@ -298,15 +298,18 @@ void PairedEndModel::read(const char* inpF) {
 	pro->read(fi);
 	npro->read(fi);
 
-	if (fscanf(fi, "%d", &M) == 1) {
-	  mw = new double[M + 1];
-	  for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+	if (fscanf(fi, "%d", &val) == 1) {
+		if (M == 0) M = val;
+		if (M == val) {
+			mw = new double[M + 1];
+			for (int i = 0; i <= M; i++) fscanf(fi, "%lf", &mw[i]);
+		}
 	}
 
 	fclose(fi);
 }
 
-//Only master node can call
+//Only master node can call. Only be called at EM.cpp
 void PairedEndModel::write(const char* outF) {
 	FILE *fo = fopen(outF, "w");
 
@@ -321,7 +324,7 @@ void PairedEndModel::write(const char* outF) {
 	npro->write(fo);
 
 	if (mw != NULL) {
-	  fprintf(fo, "%d\n", M);
+	  fprintf(fo, "\n%d\n", M);
 	  for (int i = 0; i < M; i++) {
 	    fprintf(fo, "%.15g ", mw[i]);
 	  }