Changeset 4084 for trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPosFromFile.cc

Timestamp:

05/17/04 09:35:10 (21 years ago)

Author:

rico

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcPosFromFile.cc (modified) (3 diffs)

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

@@ -60 +60 @@
 //
 MSrcPosFromFile::MSrcPosFromFile(TString cardpath, OnOffMode_t mode, const char *name, const char *title)
-  : fRawRunHeader(NULL), fSourcePositionFilePath(cardpath)
+  : MSrcPlace(TString(gsDefName+"Hist").Data()), fRawRunHeader(NULL), fSourcePositionFilePath(cardpath)
 {
   fName  = name  ? name  : gsDefName.Data();
@@ -66 +66 @@
   SetMode(mode);
 
+  fRunList=0x0;
+  fRunSrcPos=0x0;
+  fRunMap=0x0;
+
   fLastRun = 0;
-  
+  fLastValidSrcPosCam=0x0;
+}
+// -------------------------------------------------------------------------
+//
+// Destructor
+//
+MSrcPosFromFile::~MSrcPosFromFile()
+{
+  if(fRunList)
+    delete [] fRunList;
+  if(fRunSrcPos)
+    delete [] fRunSrcPos;
+  if(fRunMap)
+    delete fRunMap;
+}
+
+// -------------------------------------------------------------------------
+//
+// Open and read the input file.
+Int_t MSrcPosFromFile::PreProcess(MParList *pList)
+{
   // Count the number of runs in the card with the source poistions
   ReadSourcePositionsFile(kCount);
   
-  fRunList = new Int_t[fNumRuns];
-  fRunSrcPos = new MSrcPosCam[fNumRuns];
-  fRunMap = new TExMap(fNumRuns);
+  if(!fRunList)
+    fRunList = new Int_t[fNumRuns];
+  if(!fRunSrcPos)
+    fRunSrcPos = new MSrcPosCam[fNumRuns];
+  if(!fRunMap)
+    fRunMap = new TExMap(fNumRuns);
   
   // Read card with the source poistions
   ReadSourcePositionsFile(kRead);
-}
-
-MSrcPosFromFile::~MSrcPosFromFile()
-{
-  delete [] fRunList;
-  delete [] fRunSrcPos;
-  delete fRunMap;
-}
-
-// -------------------------------------------------------------------------
-//
-Int_t MSrcPosFromFile::PreProcess(MParList *pList)
-{
+
+
   if(!SearchForSrcPos(pList))
     return kFALSE;
@@ -119 +135 @@
       Float_t y;
         
+      *fLog << inf << "Source position for run " << run;
       if (srcpos)
         {
+          fLastValidSrcPosCam = srcpos;
           x = srcpos->GetX();
           y = srcpos->GetY();
+        }           
+      else if(fLastValidSrcPosCam)
+        {
+          x = fLastValidSrcPosCam->GetX();
+          y = fLastValidSrcPosCam->GetY();
           
-          GetSrcPosCam()->SetXY(x,y);
-                
-          *fLog << inf << "Source position for run " << run;
-          *fLog << inf << "\tX\t" << setprecision(3) << x;
-          *fLog << inf << "\tY\t" << setprecision(3) << y << endl;
-        }           
+          *fLog << inf << " not found in file. Taking previous position: ";
+        }
       else
         {
-          *fLog << inf << "Source position for run " << run << " not found in file. ";
-          *fLog << inf << "Taking previous position: ";
-          *fLog << inf << "\tX\t" << setprecision(3) << x;
-          *fLog << inf << "\tY\t" << setprecision(3) << y << endl;        
+          *fLog << err << "MSrcPosFromFile::ComputeNewSrcPosition error: no value for the first run. Don't know what values to take" << endl;
+          return kFALSE;
         }
+
+      GetSrcPosCam()->SetXY(x,y);
+      
+      *fLog << inf << "\tX\t" << setprecision(3) << x;
+      *fLog << inf << "\tY\t" << setprecision(3) << y << endl;      
     }