Index: trunk/MagicSoft/Mars/mtemp/mucm/classes/MDataSetIter.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mucm/classes/MDataSetIter.cc	(revision 4692)
+++ trunk/MagicSoft/Mars/mtemp/mucm/classes/MDataSetIter.cc	(revision 4693)
@@ -105,10 +105,9 @@
 
     //
-    // For skipping Ped and Cali with CL (aftet June 2004)
+    // For skipping Ped and Cal runs with CL (aftet June 2004)
     //
     if(src.Contains("CL") || src.Contains("ContL"))
     {
-        *fLog << warn << "For source [" << src << "] skipping CL run ["
-              << src << "]" << endl;
+        *fLog << warn << "Skipping CL run [" << src << "]" << endl;
 	return kFALSE;
     }
@@ -129,8 +128,4 @@
 	src.Remove(src.First("-"));
     }
-
-
-
-
 
 
@@ -615,7 +610,14 @@
 	if( src != FirstSrcName)
 	{
-	    *fLog << warn << "ERROR: Source Name differs inside data set ("
+	    if(type!='C')
+	    {  
+		*fLog << err << "ERROR: Source Name differs inside data set ("
 		  << src << " vs. " << FirstSrcName << ") ...exit." << endl;
-	    //return kFALSE;
+		return kFALSE;
+	    }
+	    else
+	    {
+	    	*fLog << warn << "Warning: Cal Source Name differs inside data set (" << src << " vs. " << FirstSrcName << ")." << endl;
+	    }
 	}
 
@@ -662,13 +664,13 @@
 
 	      if(CalRunFound==kFALSE)
-		{
-		    *fLog << "Adding Cal run: "<< run  << " [" << src << "]" << endl;		
-		    CalRunFound = kTRUE;
+	      {
+		  *fLog << "Adding Cal run: "<< run  << " [" << src << "]" << endl;		
+		  CalRunFound = kTRUE;
 		    
-		    fCalRuns->AddRun(run,path.Data());
-		}
+		  fCalRuns->AddRun(run,path.Data());
+	      }
 	      else 
-		  *fLog << "Skippin Cal run: "<< run  << " [" << src << "]" << endl;
-
+		  *fLog << "SKIPPING Cal run: "<< run  << " [" << src << "]" << endl;
+	      
 
 	    }