Changeset 1745 for trunk/MagicSoft/Mars/mtemp/MVPObject.cc

Timestamp:

02/06/03 11:59:10 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/MVPObject.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/MVPObject.cc

@@ -113 +113 @@
 // HHMMsDDT, where RA is given in hours and minutes and Declination is
 // given by degrees DD and tenths of degrees T. "s" may be "+" or
-// "-"
-//
-void MVPObject::SetObjectByName(char* object)
+// "-", eg. "1959+650"
+//
+void MVPObject::SetObjectByName(const char *object)
 {
   fObjectName=object;
   fGotName=kTRUE;
   
-//   cout<<"OBJ:"<<object<<endl;
-
-  unsigned int delim=0;
-  for (unsigned int i=0; i<strlen(object); i++) 
-    if ((object[i]=='+')||(object[i]=='-'))
-      delim=i;
-  
-  char ra[6];
-  char de[6];
-  
-  unsigned int i;
-  for (i=0;  i<=delim; i++)
-    ra[i]=object[i];
-  ra[i-1]=0;
-
-  for (i=delim+1;  i<strlen(object); i++)
-    de[i-delim-1]=object[i];
-  de[i-delim-1]=0;
-
-  Float_t RA, Dec;
-
-  sscanf(ra,"%f",&RA);
-  sscanf(de,"%f",&Dec);
-
-//   cout<<"OBJd:"<<Dec<<endl; //220
-//   cout<<"OBJr:"<<RA<<endl; //1959
-
-  if (object[delim]=='-') Dec*=-1;
-
-  fRA=(Double_t)( fgHrsToRad*  ((Int_t)(RA/100) + ( RA-(Int_t)(RA/100)*100)/60        ));
-  fDec=(Double_t)( fgDegToRad* ((Int_t)(Dec/10) + (Dec-(Int_t)(Dec/10)*10 )/10        ));
-
- //  fRA=(Double_t)( fgHrsToRad*  ((Int_t)(RA/100)   + ((RA / 100)-(Int_t)(RA/100))/60   ));
-//   fDec=(Double_t)( fgDegToRad* ((Int_t)(Dec/10)  + ((Dec / 10)-(Int_t)(Dec/100))/10 ));
-
-//     cout<<"OBJd:"<<fDec/fgDegToRad<<endl;
-//     cout<<"OBJr:"<<fRA/fgHrsToRad<<endl;
+  Int_t ra, dec;
+  sscanf(object, "%d%d", &ra, &dec);
+
+  fRA  = fgHrsToRad * (0.01*ra + (r%100)/60.);
+  fDec = fgDegToRad * 0.1 * dec;
 
   fGotRA=kTRUE;