Changeset 4693 for trunk/MagicSoft

Timestamp:

08/19/04 20:42:52 (20 years ago)

Author:

marcos

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mucm/classes/MDataSetIter.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mtemp/mucm/classes/MDataSetIter.cc

@@ -105 +105 @@
 
     //
-    // 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 +128 @@
         src.Remove(src.First("-"));
     }
-
-
-
-
 
 
@@ -615 +610 @@
         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 +664 @@
 
               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;
+              
 
             }