--- calo/ground/COMMON/inc/CaloFunctions.h	2005/12/06 10:18:53	1.1.1.1
+++ calo/ground/COMMON/inc/CaloFunctions.h	2006/03/09 15:55:27	1.3
@@ -1,12 +1,16 @@
 //
 //   Calorimeter useful functions and subroutines - Emiliano Mocchiutti
 //
-//   CaloFunctions.h      version 4.00  (2005-11-29)
+//   CaloFunctions.h      version 4.02  (2006-01-24)
 //
 //   Programs in this file are called by other programs and cannot be run by hand.
 //
 //   Changelog:
 //
+//   4.01 - 4.02 (2006-01-24): small bug in getfileLEVname fixed.
+//
+//   4.00 - 4.01 (2005-12-13): bug in CaloFindCalibs (do not search on other calibration files when fails to find any calibration): fixed.
+//
 //   3.10 - 4.00 (2005-11-29): preparing for the final release, changed checkemilib (PAM_YODALIB -> PAM_YODA).
 //
 //   3.09 - 3.10 (2005-11-15): changed langaupro since it did not work in the compiled version; changed WhatToDo to work in compiled version.
@@ -1146,7 +1150,7 @@
     stringcopy(tmptempf,filename,spos,epos);
     const char *tempf = tmptempf;
     file.str("");
-    file << tempf << ".Physics.Level";
+    file << tempf << "00.Physics.Level";
     //    file << "00.Physics.Level";
     file << num << ".";
     file << det << ".Event.";
@@ -1325,11 +1329,23 @@
 	if ( inter == 0 ){
 	    printf(" WARNING: no suitable calibration for section %i in this file!\n",s);
 	    printf(" I WILL SEARCH IN PREVIOUS FILES\n");
+	    if ( !firstlook ){
+		wused = 2;
+		filename = calibfile;
+		firstlook = 1;
+		goto repeatsearch;
+	    };
 	};
 	if ( inter > 50 ){
 	    printf(" WARNING: cannot handle more than 50 calibrations for file!\n");
 	    printf(" I WILL SEARCH IN PREVIOUS FILES\n");
 	    inter = 0;
+	    if ( !firstlook ){
+		wused = 2;
+		filename = calibfile;
+		firstlook = 1;
+		goto repeatsearch;
+	    };
 	};
 	if ( obtjump ){
 	    calib.obtjump = 1;