Changeset 4328 for trunk/MagicSoft/Mars/mtemp/mifae/library

Timestamp:

06/22/04 20:49:26 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• IFAELinkDef.h (modified) (1 diff)
• MIslands.cc (modified) (1 diff)
• MSrcPosFromFile.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/library/IFAELinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MCalibrateDC+;
 #pragma link C++ class MHPSFFromStars+;
-#pragma link C++ class MSrcPosFromStars+;
+#pragma link C++ class MControlPlots+;
 
 #endif

trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc

@@ -46 +46 @@
         *fLog << "    + Pixel Number = " << fPixNum[i] << endl;
         *fLog << "    + SigToNoise = " << fSigToNoise[i] << endl;
+        *fLog << "    + TimeSpread = " << fTimeSpread[i] << endl;
       }
 }

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPosFromFile.cc

@@ -142 +142 @@
       if(srcpos)
         fLastValidSrcPosCam = srcpos;
+      else if(run>fFirstRun)
+        for(UInt_t irun=run-1; irun>=fFirstRun;irun--)
+          if((srcpos=(MSrcPosCam*)fRunMap->GetValue(irun)))
+            {
+              *fLog << inf << " not found in file. Taking position for run "<< irun;
+              fLastValidSrcPosCam = srcpos;
+              break;
+            }
       else if(fLastValidSrcPosCam)
         *fLog << inf << " not found in file. Taking previous position: ";
-      else
+        
+      if(!fLastValidSrcPosCam)
         {
-          *fLog << warn << "MSrcPosFromFile::ComputeNewSrcPosition warning: no value for the first run. Taking first found run in file, run number " << fFirstRun << endl;
-          fLastValidSrcPosCam = (MSrcPosCam*)fRunMap->GetValue(run);
+          *fLog << warn << "MSrcPosFromFile::ComputeNewSrcPosition warning: no value for the first run. Taking first found run in file, run number " << fFirstRun;
+          fLastValidSrcPosCam = (MSrcPosCam*)fRunMap->GetValue(fFirstRun);
         }
 

trunk/MagicSoft/Mars/mtemp/mifae/library/Makefile

@@ -63 +63 @@
         MCalibrateDC.cc \
         MHPSFFromStars.cc \
-        MSrcPosFromStars.cc
+        MControlPlots.cc
+        
 
 ############################################################